Android: Use environment setup from library instead

[pulseview.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index 5ff61d98918ba2ee40c05818e2d7e9665b6a3aa6..07d6dc3f8f7c308443c03032f967feea587b1b59 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -27,7 +27,7 @@
 
 #include <getopt.h>
 
 
 #include <getopt.h>
 

-#include <QtGui/QApplication>
+#include <QApplication>

 #include <QDebug>
 
 #ifdef ENABLE_SIGNALS
 #include <QDebug>
 
 #ifdef ENABLE_SIGNALS


@@ -36,6 +36,10 @@
 
 #include "pv/devicemanager.h"
 #include "pv/mainwindow.h"
 
 #include "pv/devicemanager.h"
 #include "pv/mainwindow.h"

+#ifdef ANDROID
+#include <libsigrokandroidutils/libsigrokandroidutils.h>
+#include "android/loghandler.h"
+#endif

 
 #include "config.h"
 
 
 #include "config.h"
 


@@ -71,6 +75,11 @@ int main(int argc, char *argv[])
        QApplication::setApplicationName("PulseView");
        QApplication::setOrganizationDomain("sigrok.org");
 
        QApplication::setApplicationName("PulseView");
        QApplication::setOrganizationDomain("sigrok.org");
 

+#ifdef ANDROID
+       srau_init_environment();
+       pv::AndroidLogHandler::install_callbacks();
+#endif
+

        // Parse arguments
        while (1) {
                static const struct option long_options[] = {
        // Parse arguments
        while (1) {
                static const struct option long_options[] = {