X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=main.cpp;h=5c3e5b25818ffc70d1ac28a347e9b33cb91bda47;hb=dac1bb975265d33e7aeb0e3fc0342260613af9d1;hp=3fa93c4586951c81618141a2ab5f7d28a6af3646;hpb=269528f55e7fd77f762c2008d257921cd30e1519;p=pulseview.git

diff --git a/main.cpp b/main.cpp
index 3fa93c4..5c3e5b2 100644
--- a/main.cpp
+++ b/main.cpp
@@ -27,18 +27,28 @@
 
 #include <getopt.h>
 
-#include <QtGui/QApplication>
 #include <QDebug>
 
 #ifdef ENABLE_SIGNALS
 #include "signalhandler.h"
 #endif
 
+#include "pv/application.h"
 #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,
@@ -58,12 +68,12 @@ int main(int argc, char *argv[])
 	struct sr_context *sr_ctx = NULL;
 	const char *open_file = NULL;
 
-	QApplication a(argc, argv);
+	Application a(argc, argv);
 
-	// Set some application metadata
-	QApplication::setApplicationVersion(PV_VERSION_STRING);
-	QApplication::setApplicationName("PulseView");
-	QApplication::setOrganizationDomain("http://www.sigrok.org");
+#ifdef ANDROID
+	srau_init_environment();
+	pv::AndroidLogHandler::install_callbacks();
+#endif
 
 	// Parse arguments
 	while (1) {