]> git.pld-linux.org Git - packages/qt4.git/blob - qt-everywhere-opensource-src-4.8.4-qgtkstyle_disable_gtk_theme_check.patch
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
1 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
2 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
3 --- 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
4 +++ qt-everywhere-opensource-src-4.8.4/src/gui/styles/qgtkstyle_p.cpp   2013-01-04 11:37:22.111481756 -0600
5 @@ -503,21 +503,6 @@ void QGtkStylePrivate::initGtkWidgets()
6          return;
7      }
8  
9 -    static QString themeName;
10 -    if (!gtkWidgetMap()->contains("GtkWindow") && themeName.isEmpty()) {
11 -        themeName = getThemeName();
12 -
13 -        if (themeName.isEmpty()) {
14 -            qWarning("QGtkStyle was unable to detect the current GTK+ theme.");
15 -            return;
16 -        } else if (themeName == QLS("Qt") || themeName == QLS("Qt4")) {
17 -            // Due to namespace conflicts with Qt3 and obvious recursion with Qt4,
18 -            // we cannot support the GTK_Qt Gtk engine
19 -            qWarning("QGtkStyle cannot be used together with the GTK_Qt engine.");
20 -            return;
21 -        }
22 -    }
23 -
24      if (QGtkStylePrivate::gtk_init) {
25          // Gtk will set the Qt error handler so we have to reset it afterwards
26          x11ErrorHandler qt_x_errhandler = XSetErrorHandler(0);
This page took 0.071959 seconds and 3 git commands to generate.