]> git.pld-linux.org Git - packages/qt4.git/blob - qt-everywhere-opensource-src-4.8.4-qgtkstyle_disable_gtk_theme_check.patch
bump icu abi to 72
[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,18 +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 == QLS("Qt") || themeName == QLS("Qt4")) {
14 -            // Due to namespace conflicts with Qt3 and obvious recursion with Qt4,
15 -            // we cannot support the GTK_Qt Gtk engine
16 -            qWarning("QGtkStyle cannot be used together with the GTK_Qt engine.");
17 -            return;
18 -        }
19 -    }
20 -
21      if (QGtkStylePrivate::gtk_init) {
22          // Gtk will set the Qt error handler so we have to reset it afterwards
23          x11ErrorHandler qt_x_errhandler = XSetErrorHandler(0);
24
This page took 0.034713 seconds and 3 git commands to generate.