diff options
| -rw-r--r-- | mobile-widgets/qmlmanager.cpp | 6 | ||||
| -rw-r--r-- | mobile-widgets/qmlmanager.h | 2 | ||||
| -rw-r--r-- | qt-models/messagehandlermodel.cpp | 7 |
3 files changed, 10 insertions, 5 deletions
diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index 9aaca2f24..c2b2b66fd 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -373,7 +373,7 @@ void QMLManager::finishSetup() QMLManager::~QMLManager() { -#if defined(Q_OS_ANDROID) +#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) if (appLogFileOpen) appLogFile.close(); #endif @@ -1630,7 +1630,7 @@ void QMLManager::setBtEnabled(bool value) m_btEnabled = value; } -#if defined (Q_OS_ANDROID) +#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) void writeToAppLogFile(QString logText) { @@ -1649,7 +1649,9 @@ void QMLManager::writeToAppLogFile(QString logText) appLogFile.flush(); } } +#endif +#if defined(Q_OS_ANDROID) //HACK to color the system bar on Android, use qtandroidextras and call the appropriate Java methods //this code is based on code in the Kirigami example app for Android (under LGPL-2) Copyright 2017 Marco Martin diff --git a/mobile-widgets/qmlmanager.h b/mobile-widgets/qmlmanager.h index 01c56cae4..dd3d48dff 100644 --- a/mobile-widgets/qmlmanager.h +++ b/mobile-widgets/qmlmanager.h @@ -143,7 +143,7 @@ public: Q_INVOKABLE void setStatusbarColor(QColor color); void btHostModeChange(QBluetoothLocalDevice::HostMode state); -#if defined(Q_OS_ANDROID) +#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) void writeToAppLogFile(QString logText); #endif diff --git a/qt-models/messagehandlermodel.cpp b/qt-models/messagehandlermodel.cpp index e14aaf89c..be077a1a3 100644 --- a/qt-models/messagehandlermodel.cpp +++ b/qt-models/messagehandlermodel.cpp @@ -5,11 +5,14 @@ #if !defined(Q_OS_ANDROID) #define INFO(fmt, ...) fprintf(stderr, "INFO: " fmt "\n", ##__VA_ARGS__) #else -extern void writeToAppLogFile(QString logText); #include <android/log.h> #define INFO(fmt, ...) __android_log_print(ANDROID_LOG_DEBUG, __FILE__, "INFO: " fmt "\n", ##__VA_ARGS__); #endif +#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) +extern void writeToAppLogFile(QString logText); +#endif + void logMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) { Q_UNUSED(context) @@ -43,7 +46,7 @@ void MessageHandlerModel::addLog(QtMsgType type, const QString& message) m_data.append({message, type}); endInsertRows(); INFO("%s", qPrintable(message)); -#if defined (Q_OS_ANDROID) +#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) writeToAppLogFile(message); #endif } |