From 0f4c30c14f22f32ccf293c0195d1011fa39b819c Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 31 Mar 2024 23:04:39 +0200 Subject: [PATCH] Format Android-specific files (also when not building for Android) --- CMakeLists.txt | 2 ++ quickgui/android.cpp | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 60e8fd0..ce4e672 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,6 +43,8 @@ set(QML_SRC_FILES quickgui/controller.cpp quickgui/initiatequick.cpp resources/i if (ANDROID) list(APPEND QML_HEADER_FILES quickgui/android.h) list(APPEND QML_SRC_FILES quickgui/android.cpp) +else () + list(APPEND EXCLUDED_FILES quickgui/android.h quickgui/android.cpp) endif () set(TS_FILES translations/${META_PROJECT_NAME}_de_DE.ts translations/${META_PROJECT_NAME}_en_US.ts) diff --git a/quickgui/android.cpp b/quickgui/android.cpp index fe4ae48..70256b0 100644 --- a/quickgui/android.cpp +++ b/quickgui/android.cpp @@ -5,9 +5,9 @@ #include -#include #include #include +#include #include #include @@ -56,8 +56,9 @@ bool showAndroidFileDialog(bool existing, bool createNew) int openFileDescriptorFromAndroidContentUrl(const QString &url, const QString &mode) { - return QJniObject(QNativeInterface::QAndroidApplication::context()).callMethod("openFileDescriptorFromAndroidContentUri", "(Ljava/lang/String;Ljava/lang/String;)I", - QJniObject::fromString(url).object(), QJniObject::fromString(mode).object()); + return QJniObject(QNativeInterface::QAndroidApplication::context()) + .callMethod("openFileDescriptorFromAndroidContentUri", "(Ljava/lang/String;Ljava/lang/String;)I", + QJniObject::fromString(url).object(), QJniObject::fromString(mode).object()); } void writeToAndroidLog(QtMsgType type, const QMessageLogContext &context, const QString &msg) @@ -110,7 +111,8 @@ static void onAndroidFileDialogAccepted(JNIEnv *, jobject, jstring fileName, jbo Q_ARG(QString, QJniObject::fromLocalRef(fileName).toString()), Q_ARG(bool, existing), Q_ARG(bool, createNew)); } -static void onAndroidFileDialogAcceptedDescriptor(JNIEnv *, jobject, jstring nativeUrl, jstring fileName, jint fileHandle, jboolean existing, jboolean createNew) +static void onAndroidFileDialogAcceptedDescriptor( + JNIEnv *, jobject, jstring nativeUrl, jstring fileName, jint fileHandle, jboolean existing, jboolean createNew) { QMetaObject::invokeMethod(QtGui::controllerForAndroid, "handleFileSelectionAcceptedDescriptor", Qt::QueuedConnection, Q_ARG(QString, QJniObject::fromLocalRef(nativeUrl).toString()), Q_ARG(QString, QJniObject::fromLocalRef(fileName).toString()),