aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Strømme <christian.stromme@digia.com>2014-01-30 13:32:02 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-07 10:24:30 +0100
commita4dd3f81448db91b10bdfb236ac81caa8617c381 (patch)
tree1a7839c11e70849c8adbce511eb4e00030d1df24
parent2c9ca420bf3f8b32977a88e7923f18cc7557c613 (diff)
Add API to get the Android API level
The Android SDK version, or API level, is commonly used to determine what APIs are available at runtime. [ChangeLog][QtAndroidExtras] Added convenience method for getting the Android SDK version. Change-Id: Ic20322f68bc9680aec9e1c8404583462063904db Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
-rw-r--r--src/androidextras/android/qandroidfunctions.cpp11
-rw-r--r--src/androidextras/android/qandroidfunctions.h1
-rw-r--r--tests/auto/qandroidfunctions/tst_qandroidfunctions.cpp6
3 files changed, 18 insertions, 0 deletions
diff --git a/src/androidextras/android/qandroidfunctions.cpp b/src/androidextras/android/qandroidfunctions.cpp
index 55bc50a..2524614 100644
--- a/src/androidextras/android/qandroidfunctions.cpp
+++ b/src/androidextras/android/qandroidfunctions.cpp
@@ -66,4 +66,15 @@ QAndroidJniObject QtAndroid::androidActivity()
return QtAndroidPrivate::activity();
}
+/*!
+ \since 5.3
+ \fn int QtAndroid::androidSdkVersion()
+
+ Returns the Android SDK version. This is also known as the API level.
+*/
+int QtAndroid::androidSdkVersion()
+{
+ return QtAndroidPrivate::androidSdkVersion();
+}
+
QT_END_NAMESPACE
diff --git a/src/androidextras/android/qandroidfunctions.h b/src/androidextras/android/qandroidfunctions.h
index ffd7c3b..700bee8 100644
--- a/src/androidextras/android/qandroidfunctions.h
+++ b/src/androidextras/android/qandroidfunctions.h
@@ -54,6 +54,7 @@ QT_BEGIN_NAMESPACE
namespace QtAndroid
{
Q_ANDROIDEXTRAS_EXPORT QAndroidJniObject androidActivity();
+ Q_ANDROIDEXTRAS_EXPORT int androidSdkVersion();
}
QT_END_NAMESPACE
diff --git a/tests/auto/qandroidfunctions/tst_qandroidfunctions.cpp b/tests/auto/qandroidfunctions/tst_qandroidfunctions.cpp
index 9f6bfd9..4288b34 100644
--- a/tests/auto/qandroidfunctions/tst_qandroidfunctions.cpp
+++ b/tests/auto/qandroidfunctions/tst_qandroidfunctions.cpp
@@ -46,9 +46,15 @@ class tst_QAndroidFunctions : public QObject
{
Q_OBJECT
private slots:
+ void testAndroidSdkVersion();
void testAndroidActivity();
};
+void tst_QAndroidFunctions::testAndroidSdkVersion()
+{
+ QVERIFY(QtAndroid::androidSdkVersion() > 0);
+}
+
void tst_QAndroidFunctions::testAndroidActivity()
{
QAndroidJniObject activity = QtAndroid::androidActivity();