qtgui-4.8.5-disable-gtk-theme-check.patch 1.1 KB

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