diff options
| author | Dmitry Shachnev <mitya57@gmail.com> | 2013-04-04 19:31:49 +0400 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-05 11:32:00 +0200 |
| commit | 6c879b9b7c5099455a29c95b24d6cb7e69baff99 (patch) | |
| tree | d7e98ede41b7f7430d14faa5ce89ad06cdf8a4a1 | |
| parent | f8ff5263ac85bbad6d5073c12211cd089a489480 (diff) | |
QGtkStyle: remove obsolete themeName != "Qt" checks
Change-Id: Ibb6d952f6abc398ac5deb94d3bdfd8560777aa44
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| -rw-r--r-- | src/widgets/styles/qgtkstyle_p.cpp | 12 |
1 files changed, 0 insertions, 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 |