From 7c241b8572aa8904cbcd1667b91177af18d36013 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 14 Mar 2013 12:20:43 +0100 Subject: QmlJsTools: Remove unneeded #ifdef. Replace compile-time check for host OS with runtime check. Change-Id: I78cd914e82a604c2c78fa6b679baa6a0392d2ed3 Reviewed-by: Aurindam Jana --- src/plugins/qmljstools/qmlconsoleview.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/plugins/qmljstools/qmlconsoleview.cpp') diff --git a/src/plugins/qmljstools/qmlconsoleview.cpp b/src/plugins/qmljstools/qmlconsoleview.cpp index 50d45b1c28..6a3117370f 100644 --- a/src/plugins/qmljstools/qmlconsoleview.cpp +++ b/src/plugins/qmljstools/qmlconsoleview.cpp @@ -33,6 +33,7 @@ #include #include +#include #include #include @@ -103,8 +104,8 @@ QmlConsoleView::QmlConsoleView(QWidget *parent) : "image: none; }")); QString baseName = QApplication::style()->objectName(); -#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) - if (baseName == QLatin1String("windows")) { + if (Utils::HostOsInfo::isAnyUnixHost() && !Utils::HostOsInfo::isMacHost() + && baseName == QLatin1String("windows")) { // Sometimes we get the standard windows 95 style as a fallback if (QStyleFactory::keys().contains(QLatin1String("Fusion"))) baseName = QLatin1String("fusion"); // Qt5 @@ -117,7 +118,6 @@ QmlConsoleView::QmlConsoleView(QWidget *parent) : baseName = QLatin1String("cleanlooks"); } } -#endif QmlConsoleViewStyle *style = new QmlConsoleViewStyle(baseName); setStyle(style); style->setParent(this); -- cgit v1.2.1