Format Android-specific files (also when not building for Android)
This commit is contained in:
parent
21a16e0be0
commit
0f4c30c14f
|
@ -43,6 +43,8 @@ set(QML_SRC_FILES quickgui/controller.cpp quickgui/initiatequick.cpp resources/i
|
||||||
if (ANDROID)
|
if (ANDROID)
|
||||||
list(APPEND QML_HEADER_FILES quickgui/android.h)
|
list(APPEND QML_HEADER_FILES quickgui/android.h)
|
||||||
list(APPEND QML_SRC_FILES quickgui/android.cpp)
|
list(APPEND QML_SRC_FILES quickgui/android.cpp)
|
||||||
|
else ()
|
||||||
|
list(APPEND EXCLUDED_FILES quickgui/android.h quickgui/android.cpp)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
set(TS_FILES translations/${META_PROJECT_NAME}_de_DE.ts translations/${META_PROJECT_NAME}_en_US.ts)
|
set(TS_FILES translations/${META_PROJECT_NAME}_de_DE.ts translations/${META_PROJECT_NAME}_en_US.ts)
|
||||||
|
|
|
@ -5,9 +5,9 @@
|
||||||
|
|
||||||
#include <c++utilities/conversion/stringbuilder.h>
|
#include <c++utilities/conversion/stringbuilder.h>
|
||||||
|
|
||||||
#include <QJniObject>
|
|
||||||
#include <QColor>
|
#include <QColor>
|
||||||
#include <QCoreApplication>
|
#include <QCoreApplication>
|
||||||
|
#include <QJniObject>
|
||||||
#include <QMessageLogContext>
|
#include <QMessageLogContext>
|
||||||
#include <QMetaObject>
|
#include <QMetaObject>
|
||||||
|
|
||||||
|
@ -56,8 +56,9 @@ bool showAndroidFileDialog(bool existing, bool createNew)
|
||||||
|
|
||||||
int openFileDescriptorFromAndroidContentUrl(const QString &url, const QString &mode)
|
int openFileDescriptorFromAndroidContentUrl(const QString &url, const QString &mode)
|
||||||
{
|
{
|
||||||
return QJniObject(QNativeInterface::QAndroidApplication::context()).callMethod<jint>("openFileDescriptorFromAndroidContentUri", "(Ljava/lang/String;Ljava/lang/String;)I",
|
return QJniObject(QNativeInterface::QAndroidApplication::context())
|
||||||
QJniObject::fromString(url).object<jstring>(), QJniObject::fromString(mode).object<jstring>());
|
.callMethod<jint>("openFileDescriptorFromAndroidContentUri", "(Ljava/lang/String;Ljava/lang/String;)I",
|
||||||
|
QJniObject::fromString(url).object<jstring>(), QJniObject::fromString(mode).object<jstring>());
|
||||||
}
|
}
|
||||||
|
|
||||||
void writeToAndroidLog(QtMsgType type, const QMessageLogContext &context, const QString &msg)
|
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));
|
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,
|
QMetaObject::invokeMethod(QtGui::controllerForAndroid, "handleFileSelectionAcceptedDescriptor", Qt::QueuedConnection,
|
||||||
Q_ARG(QString, QJniObject::fromLocalRef(nativeUrl).toString()), Q_ARG(QString, QJniObject::fromLocalRef(fileName).toString()),
|
Q_ARG(QString, QJniObject::fromLocalRef(nativeUrl).toString()), Q_ARG(QString, QJniObject::fromLocalRef(fileName).toString()),
|
||||||
|
|
Loading…
Reference in New Issue