summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEirik Aavitsland <eirik.aavitsland@theqtcompany.com>2016-03-18 14:40:17 +0100
committerEirik Aavitsland <eirik.aavitsland@qt.io>2016-04-29 10:02:43 +0000
commitce97d9c8ef4e6f8cb2166065b6732cad3cccf604 (patch)
treeab730a4b976c30d5098517e05020bff0f119e5c7 /src
parent44c28c76a1117b55e6cf9e776538b94e8453f76e (diff)
downloadqtquickcontrols-ce97d9c8ef4e6f8cb2166065b6732cad3cccf604.tar.gz
Remove the traces of the discontinued android-no-sdk platform
Change-Id: I63e4e2b807e7b222a589a5e03d510acfe1d97511 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/controls/Private/qquickcontrolsettings.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp
index 8861296d..450f91b6 100644
--- a/src/controls/Private/qquickcontrolsettings.cpp
+++ b/src/controls/Private/qquickcontrolsettings.cpp
@@ -47,7 +47,7 @@
#include <QTouchDevice>
#include <QGuiApplication>
#include <QStyleHints>
-#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK)
+#if defined(Q_OS_ANDROID)
#include <private/qjnihelpers_p.h>
#endif
@@ -59,7 +59,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) && !defined(Q_OS_ANDROID_NO_SDK)
+#elif defined(Q_OS_ANDROID)
if (QtAndroidPrivate::androidSdkVersion() >= 11)
return QLatin1String("Android");
#elif defined(Q_OS_IOS)