Android: Use environment setup from library instead

[pulseview.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index 3fa93c4586951c81618141a2ab5f7d28a6af3646..07d6dc3f8f7c308443c03032f967feea587b1b59 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -27,7 +27,7 @@
 
 #include <getopt.h>
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QDebug>
 
 #ifdef ENABLE_SIGNALS
@@ -36,9 +36,19 @@
 
 #include "pv/devicemanager.h"
 #include "pv/mainwindow.h"
+#ifdef ANDROID
+#include <libsigrokandroidutils/libsigrokandroidutils.h>
+#include "android/loghandler.h"
+#endif
 
 #include "config.h"
 
+#ifdef _WIN32
+// The static qsvg lib is required for SVG graphics/icons (on Windows).
+#include <QtPlugin>
+Q_IMPORT_PLUGIN(qsvg)
+#endif
+
 void usage()
 {
        fprintf(stdout,
@@ -63,7 +73,12 @@ int main(int argc, char *argv[])
        // Set some application metadata
        QApplication::setApplicationVersion(PV_VERSION_STRING);
        QApplication::setApplicationName("PulseView");
-       QApplication::setOrganizationDomain("http://www.sigrok.org");
+       QApplication::setOrganizationDomain("sigrok.org");
+
+#ifdef ANDROID
+       srau_init_environment();
+       pv::AndroidLogHandler::install_callbacks();
+#endif
 
        // Parse arguments
        while (1) {