diff options
| -rw-r--r-- | src/quick/platform/android/qandroidquickviewembedding.cpp | 11 | ||||
| -rw-r--r-- | src/quick/platform/android/qandroidquickviewembedding_p.h | 4 |
2 files changed, 3 insertions, 12 deletions
diff --git a/src/quick/platform/android/qandroidquickviewembedding.cpp b/src/quick/platform/android/qandroidquickviewembedding.cpp index e7932d80ae..262dd9179c 100644 --- a/src/quick/platform/android/qandroidquickviewembedding.cpp +++ b/src/quick/platform/android/qandroidquickviewembedding.cpp @@ -29,20 +29,13 @@ namespace QtAndroidQuickViewEmbedding void createQuickView(JNIEnv *, jobject nativeWindow, jstring qmlUri, jint width, jint height, jlong parentWindowReference, jlong viewReference, - QtJniTypes::StringArray qmlImportPaths) + const QJniArray<jstring> &qmlImportPaths) { static_assert (sizeof(jlong) >= sizeof(void*), "Insufficient size of Java type to hold the c++ pointer"); const QUrl qmlUrl(QJniObject(qmlUri).toString()); - QStringList importPaths; - if (qmlImportPaths.isValid()) { - QJniArray<QtJniTypes::String> importPathsArray(qmlImportPaths); - importPaths.reserve(importPathsArray.size()); - for (int i = 0; i < importPathsArray.size(); ++i) - importPaths << importPathsArray.at(i).toString(); - } - + const QStringList importPaths = qmlImportPaths.toContainer(); QMetaObject::invokeMethod(qApp, [qtViewObject = QJniObject(nativeWindow), parentWindowReference, viewReference, diff --git a/src/quick/platform/android/qandroidquickviewembedding_p.h b/src/quick/platform/android/qandroidquickviewembedding_p.h index 9c5e4a75ed..43ff997264 100644 --- a/src/quick/platform/android/qandroidquickviewembedding_p.h +++ b/src/quick/platform/android/qandroidquickviewembedding_p.h @@ -23,14 +23,12 @@ QT_BEGIN_NAMESPACE -Q_DECLARE_JNI_TYPE(StringArray, "[Ljava/lang/String;") - namespace QtAndroidQuickViewEmbedding { bool registerNatives(QJniEnvironment& env); void createQuickView(JNIEnv *env, jobject nativeWindow, jstring qmlUri, jint width, jint height, jlong parentWindowReference, jlong viewReference, - QtJniTypes::StringArray qmlImportPaths); + const QJniArray<jstring> &qmlImportPaths); Q_DECLARE_JNI_NATIVE_METHOD_IN_CURRENT_SCOPE(createQuickView) void setRootObjectProperty(JNIEnv *env, jobject, jlong parentWindowReference, jstring propertyName, jobject value); |
