From 6c879b9b7c5099455a29c95b24d6cb7e69baff99 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Thu, 4 Apr 2013 19:31:49 +0400 Subject: QGtkStyle: remove obsolete themeName != "Qt" checks Change-Id: Ibb6d952f6abc398ac5deb94d3bdfd8560777aa44 Reviewed-by: Jens Bache-Wiig --- src/widgets/styles/qgtkstyle_p.cpp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/widgets/styles/qgtkstyle_p.cpp b/src/widgets/styles/qgtkstyle_p.cpp index f29f250de0..c2f6b99349 100644 --- a/src/widgets/styles/qgtkstyle_p.cpp +++ b/src/widgets/styles/qgtkstyle_p.cpp @@ -529,18 +529,6 @@ void QGtkStylePrivate::initGtkWidgets() const 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) { #ifndef Q_OS_MAC // Gtk will set the Qt error handler so we have to reset it afterwards -- cgit v1.2.3