Blame qt-everywhere-opensource-src-4.8.5-qgtkstyle_disable_gtk_theme_check.patch
|
Rex Dieter |
ace1f8c |
diff -up qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp.qgtkstyle_disable_gtk_theme_check qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp
|
|
Rex Dieter |
ace1f8c |
--- qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp.qgtkstyle_disable_gtk_theme_check 2013-06-09 16:28:22.938840346 -0500
|
|
Rex Dieter |
ace1f8c |
+++ qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp 2013-06-09 17:03:01.781125479 -0500
|
|
Rex Dieter |
ace1f8c |
@@ -503,18 +503,6 @@ void QGtkStylePrivate::initGtkWidgets()
|
|
Rex Dieter |
809cb90 |
return;
|
|
Rex Dieter |
809cb90 |
}
|
|
Rex Dieter |
809cb90 |
|
|
Rex Dieter |
809cb90 |
- static QString themeName;
|
|
Rex Dieter |
809cb90 |
- if (!gtkWidgetMap()->contains("GtkWindow") && themeName.isEmpty()) {
|
|
Rex Dieter |
809cb90 |
- themeName = getThemeName();
|
|
Rex Dieter |
809cb90 |
-
|
|
Rex Dieter |
ace1f8c |
- if (themeName == QLS("Qt") || themeName == QLS("Qt4")) {
|
|
Rex Dieter |
809cb90 |
- // Due to namespace conflicts with Qt3 and obvious recursion with Qt4,
|
|
Rex Dieter |
809cb90 |
- // we cannot support the GTK_Qt Gtk engine
|
|
Rex Dieter |
809cb90 |
- qWarning("QGtkStyle cannot be used together with the GTK_Qt engine.");
|
|
Rex Dieter |
809cb90 |
- return;
|
|
Rex Dieter |
809cb90 |
- }
|
|
Rex Dieter |
809cb90 |
- }
|
|
Rex Dieter |
809cb90 |
-
|
|
Rex Dieter |
809cb90 |
if (QGtkStylePrivate::gtk_init) {
|
|
Rex Dieter |
809cb90 |
// Gtk will set the Qt error handler so we have to reset it afterwards
|
|
Rex Dieter |
809cb90 |
x11ErrorHandler qt_x_errhandler = XSetErrorHandler(0);
|