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