diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-12 12:50:32 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-12 12:50:32 +0200 |
| commit | 0efe37f9304b54912aff52bbe98083702d5b1f22 (patch) | |
| tree | 5997e538f7024039f3e822a129129f35efb792ef /src/controls/Private/qquickcontrolsettings.cpp | |
| parent | b3ab05a86bbc6aa2643ba0e0512cdb0f69f29fb4 (diff) | |
| parent | 2ae698e2cb403dae021596606d14ff23ec48ec4a (diff) | |
| download | qtquickcontrols-0efe37f9304b54912aff52bbe98083702d5b1f22.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Change-Id: I9253c87c3bd54204401070f492c7590166be0fe3
Diffstat (limited to 'src/controls/Private/qquickcontrolsettings.cpp')
| -rw-r--r-- | src/controls/Private/qquickcontrolsettings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp index 76c175e3..7d5a5271 100644 --- a/src/controls/Private/qquickcontrolsettings.cpp +++ b/src/controls/Private/qquickcontrolsettings.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE static QString defaultStyleName() { //Only enable QStyle support when we are using QApplication -#if !defined(Q_OS_IOS) && !defined(Q_OS_ANDROID) && !defined(Q_OS_BLACKBERRY) && !defined(Q_OS_QNX) && !defined(Q_OS_WINRT) +#if defined(QT_WIDGETS_LIB) && !defined(Q_OS_IOS) && !defined(Q_OS_ANDROID) && !defined(Q_OS_BLACKBERRY) && !defined(Q_OS_QNX) && !defined(Q_OS_WINRT) if (QCoreApplication::instance()->inherits("QApplication")) return QLatin1String("Desktop"); #elif defined(Q_OS_ANDROID) |