easthighNerd/qcma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation of android port on linux host.

Browse Source
This commit is contained in:
codestation
2016-10-26 13:42:11 -04:00
parent c3fc9af152
commit 5236770285
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
android/main_android.cpp
View File

@@ -29,11 +29,14 @@
#include <QStandardPaths> #include <QStandardPaths>
#include <inttypes.h> #include <inttypes.h>
#include <signal.h>
#include <unistd.h> #include <unistd.h>
#include <vitamtp.h> #include <vitamtp.h>
#ifdef Q_OS_ANDROID
#include <android/log.h> #include <android/log.h>
#endif
#include "servicemanager.h" #include "servicemanager.h"
@@ -45,7 +48,7 @@ static QString getAppName()
return file.open(QIODevice::ReadOnly) ? file.readLine() : ""; return file.open(QIODevice::ReadOnly) ? file.readLine() : "";
} }
#ifdef Q_OS_ANDROID
static void cleanOutput(QtMsgType type, const QMessageLogContext &, const QString & msg) static void cleanOutput(QtMsgType type, const QMessageLogContext &, const QString & msg)
{ {
QByteArray localMsg = msg.toLocal8Bit(); QByteArray localMsg = msg.toLocal8Bit();
@@ -71,7 +74,7 @@ static void cleanOutput(QtMsgType type, const QMessageLogContext &, const QStrin
#endif #endif
} }
} }
#endif
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
@@ -86,7 +89,9 @@ int main(int argc, char *argv[])
// stdout goes to /dev/null on android // stdout goes to /dev/null on android
VitaMTP_Set_Logging(VitaMTP_NONE); VitaMTP_Set_Logging(VitaMTP_NONE);
#ifdef Q_OS_ANDROID
qInstallMessageHandler(cleanOutput); qInstallMessageHandler(cleanOutput);
#endif
qDebug("Starting Qcma %s", QCMA_VER); qDebug("Starting Qcma %s", QCMA_VER);