diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2014-10-10 16:29:35 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2014-10-13 10:50:55 +0200 |
| commit | bcd07acd133d3851e202b4443b8184c6600abcb2 (patch) | |
| tree | b0fbca1c5072a16d72d53bd866ef4b55923a7c16 /src/controls/Private | |
| parent | 045c1c9c2b62802d50f07150537bdecfe86dc3ed (diff) | |
| download | qtquickcontrols-bcd07acd133d3851e202b4443b8184c6600abcb2.tar.gz | |
Android: check the minimum required SDK version (11)
Use the Base style as a fallback when the requirement is not met.
Change-Id: I0db2edae8576ffaad3ac3a78fcf3de8e73fdb750
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Diffstat (limited to 'src/controls/Private')
| -rw-r--r-- | src/controls/Private/qquickcontrolsettings.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp index f05df0d5..eca533d7 100644 --- a/src/controls/Private/qquickcontrolsettings.cpp +++ b/src/controls/Private/qquickcontrolsettings.cpp @@ -39,6 +39,9 @@ #include <QTouchDevice> #include <QGuiApplication> #include <QStyleHints> +#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK) +#include <private/qjnihelpers_p.h> +#endif QT_BEGIN_NAMESPACE @@ -49,7 +52,8 @@ static QString defaultStyleName() if (QCoreApplication::instance()->inherits("QApplication")) return QLatin1String("Desktop"); #elif defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK) - return QLatin1String("Android"); + if (QtAndroidPrivate::androidSdkVersion() >= 11) + return QLatin1String("Android"); #elif defined(Q_OS_IOS) return QLatin1String("iOS"); #endif |