diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-27 07:50:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-27 07:50:05 +0200 |
| commit | 8b36cdd25761348c285305edec1bf861a924e858 (patch) | |
| tree | f4b96b64ad5d93d92ae82e7d18ad60e8d72ce236 /src/controls/Private/qquickcontrolsettings.cpp | |
| parent | d13e4db9d74aefc0bd08ca946b789155a11361fb (diff) | |
| parent | f19b1bf1bfee79178bf5cd75df86863be49c21f0 (diff) | |
| download | qtquickcontrols-8b36cdd25761348c285305edec1bf861a924e858.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: Ie6ad3e9490dcf85bd5deb4c6d7004a4aa8b81433
Diffstat (limited to 'src/controls/Private/qquickcontrolsettings.cpp')
| -rw-r--r-- | src/controls/Private/qquickcontrolsettings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp index e6345082..c7f641cc 100644 --- a/src/controls/Private/qquickcontrolsettings.cpp +++ b/src/controls/Private/qquickcontrolsettings.cpp @@ -50,7 +50,7 @@ #include <QTouchDevice> #include <QGuiApplication> #include <QStyleHints> -#if defined(Q_OS_ANDROID) +#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED) #include <private/qjnihelpers_p.h> #endif @@ -62,7 +62,7 @@ static QString defaultStyleName() #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) +#elif defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED) if (QtAndroidPrivate::androidSdkVersion() >= 11) return QLatin1String("Android"); #elif defined(Q_OS_IOS) |