summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOtto Ryynänen <otto.ryynanen@qt.io>2017-04-21 09:44:43 (GMT)
committerOtto Ryynänen <otto.ryynanen@qt.io>2017-06-01 09:26:17 (GMT)
commit1b09866db77cd532ff1858f3f98ee1e928174961 (patch)
treec642923753a857b8c8d5d3fa42cd1ef5454fce9d
parente5f457a51d6ff38a1a4298cbad797a12ee378139 (diff)
downloadqtquickcontrols-1b09866db77cd532ff1858f3f98ee1e928174961.tar.gz
Support for Q_OS_ANDROID_EMBEDDED and android-embedded builds
The Embedded Android build (Boot to Qt Android injection) is defined by having both Q_OS_ANDROID and Q_OS_ANDROID_EMBEDDED flags defined, as well as having Qt config android-embedded. This commit enables the possibility to build embedded Android builds. (i.e. Qt build for Android baselayer only, without JNI) Change-Id: Ic825e034f8d4b39c45e03b9f0a965f126559991e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
-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 e634508..c7f641c 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)