QGtkStyle was unable to detect the current GTK+ theme (RHBZ#702493, QTBUG-5545))

[packages/qt4.git] / qt-everywhere-opensource-src-4.8.4-qgtkstyle_disable_gtk_theme_check.patch

diff --git a/qt-everywhere-opensource-src-4.8.4-qgtkstyle_disable_gtk_theme_check.patch b/qt-everywhere-opensource-src-4.8.4-qgtkstyle_disable_gtk_theme_check.patch
new file mode 100644 (file)
index 0000000..1510564
--- /dev/null
+++ b/qt-everywhere-opensource-src-4.8.4-qgtkstyle_disable_gtk_theme_check.patch
@@ -0,0 +1,26 @@
+diff -up qt-everywhere-opensource-src-4.8.4/src/gui/styles/qgtkstyle.cpp.disable_gtk_theme_check qt-everywhere-opensource-src-4.8.4/src/gui/styles/qgtkstyle.cpp
+diff -up qt-everywhere-opensource-src-4.8.4/src/gui/styles/qgtkstyle_p.cpp.disable_gtk_theme_check qt-everywhere-opensource-src-4.8.4/src/gui/styles/qgtkstyle_p.cpp
+--- qt-everywhere-opensource-src-4.8.4/src/gui/styles/qgtkstyle_p.cpp.disable_gtk_theme_check  2012-11-23 04:09:53.000000000 -0600
++++ qt-everywhere-opensource-src-4.8.4/src/gui/styles/qgtkstyle_p.cpp  2013-01-04 11:37:22.111481756 -0600
+@@ -503,21 +503,6 @@ void QGtkStylePrivate::initGtkWidgets()
+         return;
+     }
+ 
+-    static QString themeName;
+-    if (!gtkWidgetMap()->contains("GtkWindow") && themeName.isEmpty()) {
+-        themeName = getThemeName();
+-
+-        if (themeName.isEmpty()) {
+-            qWarning("QGtkStyle was unable to detect the current GTK+ theme.");
+-            return;
+-        } else 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);