AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QGtkStyle: remove obsolete themeName != "Qt" checks

Browse Source 
Change-Id: Ibb6d952f6abc398ac5deb94d3bdfd8560777aa44
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
This commit is contained in:
Dmitry Shachnev 2013-04-04 19:31:49 +04:00 committed by The Qt Project
parent f8ff5263ac
commit 6c879b9b7c
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/widgets/styles/qgtkstyle_p.cpp
View File

@ -529,18 +529,6 @@ void QGtkStylePrivate::initGtkWidgets() const
return; 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) { if (QGtkStylePrivate::gtk_init) {
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
// Gtk will set the Qt error handler so we have to reset it afterwards // Gtk will set the Qt error handler so we have to reset it afterwards