diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | dist/changes-5.12.0 | 23 | ||||
| -rw-r--r-- | src/androidextras/doc/qtandroidextras.qdocconf | 3 | ||||
| -rw-r--r-- | src/androidextras/jni/qandroidjnienvironment.cpp | 18 | ||||
| -rw-r--r-- | src/androidextras/jni/qandroidjnienvironment.h | 1 | ||||
| -rw-r--r-- | src/src.pro | 1 |
6 files changed, 45 insertions, 3 deletions
diff --git a/.qmake.conf b/.qmake.conf index a90439b..d4aef77 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.11.4 +MODULE_VERSION = 5.12.0 diff --git a/dist/changes-5.12.0 b/dist/changes-5.12.0 new file mode 100644 index 0000000..9d2cc96 --- /dev/null +++ b/dist/changes-5.12.0 @@ -0,0 +1,23 @@ +Qt 5.12 introduces many new features and improvements as well as bugfixes +over the 5.11.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.12 series is binary compatible with the 5.11.x series. +Applications compiled for 5.11 will continue to run with 5.12. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* QtAndroid * +**************************************************************************** + + - QAndroidJniEnvironment::findClass convenient method to find classes in + all class loaders. diff --git a/src/androidextras/doc/qtandroidextras.qdocconf b/src/androidextras/doc/qtandroidextras.qdocconf index bf810ad..56ce18a 100644 --- a/src/androidextras/doc/qtandroidextras.qdocconf +++ b/src/androidextras/doc/qtandroidextras.qdocconf @@ -9,8 +9,7 @@ includepaths += -I . \ -I .. \ -I ../android \ -I ../jni \ - -I ./QtAndroidExtras \ - -I $QT_INSTALL_HEADERS + -I ./QtAndroidExtras project = QtAndroidExtras description = Qt Android Extras Reference Documentation diff --git a/src/androidextras/jni/qandroidjnienvironment.cpp b/src/androidextras/jni/qandroidjnienvironment.cpp index 08f0c71..585c442 100644 --- a/src/androidextras/jni/qandroidjnienvironment.cpp +++ b/src/androidextras/jni/qandroidjnienvironment.cpp @@ -83,6 +83,19 @@ QT_BEGIN_NAMESPACE Returns the JNI Environment pointer. */ +/*! + \fn jclass QAndroidJniEnvironment::findClass(const char *className) + + Searches for \a className using all available class loaders. Qt on Android + uses a custom class loader to load all the .jar files and it must be used + to find any classes that are created by that class loader because these + classes are not visible in the default class loader. + + Returns the class pointer or null if is not found. + + \since Qt 5.12 + */ + QAndroidJniEnvironment::QAndroidJniEnvironment() : d(new QJNIEnvironmentPrivate) @@ -108,6 +121,11 @@ QAndroidJniEnvironment::operator JNIEnv*() const return d->jniEnv; } +jclass QAndroidJniEnvironment::findClass(const char *className) +{ + return QJNIEnvironmentPrivate::findClass(className, d->jniEnv); +} + static void clearException(bool silent) { QAndroidJniEnvironment env; diff --git a/src/androidextras/jni/qandroidjnienvironment.h b/src/androidextras/jni/qandroidjnienvironment.h index 654117b..4edf8f4 100644 --- a/src/androidextras/jni/qandroidjnienvironment.h +++ b/src/androidextras/jni/qandroidjnienvironment.h @@ -57,6 +57,7 @@ public: static JavaVM *javaVM(); JNIEnv *operator->(); operator JNIEnv*() const; + jclass findClass(const char *className); private: Q_DISABLE_COPY(QAndroidJniEnvironment) diff --git a/src/src.pro b/src/src.pro index 0c91144..617b68e 100644 --- a/src/src.pro +++ b/src/src.pro @@ -3,5 +3,6 @@ android { SUBDIRS += androidextras jar } else { TEMPLATE = aux + CONFIG += force_qt QMAKE_DOCS = $$PWD/androidextras/doc/qtandroidextras.qdocconf } |