diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-03-14 12:20:43 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-03-14 12:32:49 +0100 |
| commit | 7c241b8572aa8904cbcd1667b91177af18d36013 (patch) | |
| tree | ebc17e4b561a33bd42ff4107397b1b6707c23dd2 /src/plugins/qmljstools/qmlconsoleview.cpp | |
| parent | 3a042b87a29ef4d0fc0d758f86f4df28d7b0ae91 (diff) | |
| download | qt-creator-7c241b8572aa8904cbcd1667b91177af18d36013.tar.gz | |
QmlJsTools: Remove unneeded #ifdef.
Replace compile-time check for host OS with runtime check.
Change-Id: I78cd914e82a604c2c78fa6b679baa6a0392d2ed3
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Diffstat (limited to 'src/plugins/qmljstools/qmlconsoleview.cpp')
| -rw-r--r-- | src/plugins/qmljstools/qmlconsoleview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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 <texteditor/basetexteditor.h> #include <coreplugin/manhattanstyle.h> +#include <utils/hostosinfo.h> #include <QMouseEvent> #include <QPainter> @@ -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); |