diff options
| author | Dmitry Shachnev <mitya57@gmail.com> | 2013-04-11 13:32:00 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-11 18:29:37 (GMT) |
| commit | a9dc50330acee2ac4fe4e09677ec71885e7baf08 (patch) | |
| tree | d06587ee72628ec6cff58b7c6e6865c142da46d7 | |
| parent | c0daaf1c701345b5e97684f9b564343ada3ad346 (diff) | |
| download | Qt-a9dc50330acee2ac4fe4e09677ec71885e7baf08.zip Qt-a9dc50330acee2ac4fe4e09677ec71885e7baf08.tar.gz Qt-a9dc50330acee2ac4fe4e09677ec71885e7baf08.tar.bz2 | |
QGtkStyle: remove an unnecessary sanity check for theme name
This makes QGtkStyle working again on Debian experimental
and Ubuntu 13.04, where getThemeName() returns empty value.
Backported from QtBase b72aa1cad30a44b1.
Change-Id: If4cc822970088a5fb31aa28d9951db1efc0bb4fd
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| -rw-r--r-- | src/gui/styles/qgtkstyle_p.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gui/styles/qgtkstyle_p.cpp b/src/gui/styles/qgtkstyle_p.cpp index a21eead..302cf09 100644 --- a/src/gui/styles/qgtkstyle_p.cpp +++ b/src/gui/styles/qgtkstyle_p.cpp @@ -507,10 +507,7 @@ void QGtkStylePrivate::initGtkWidgets() const if (!gtkWidgetMap()->contains("GtkWindow") && themeName.isEmpty()) { themeName = getThemeName(); - if (themeName.isEmpty()) { - qWarning("QGtkStyle was unable to detect the current GTK+ theme."); - return; - } else if (themeName == QLS("Qt") || themeName == QLS("Qt4")) { + 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."); |