diff --git a/src/androidextras/android/qandroidfunctions.cpp b/src/androidextras/android/qandroidfunctions.cpp index 55bc50a8504cb9636c068aa9f3b65ed52894b24c..2524614a380051303e8581fcd8bac43333c08798 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 ffd7c3bcdb970f200a7fcdfc70e4d085eeac7c0a..700bee8099e39752f7a23e90a15b23b80a6b5905 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 9f6bfd947b094032c51dc233199893f6332cbdf2..4288b3419c4fbd798e09e926cbf03b7cbe30e9ae 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();