X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=5c3e5b25818ffc70d1ac28a347e9b33cb91bda47;hp=0d59baef16847a8735f22b8f9e7ff081e1582e53;hb=686a9bf7f6f720f3ad431fbb0103444504709a80;hpb=9137928c9a711ff6d7bf25c9627236d3c61f069e

diff --git a/main.cpp b/main.cpp
index 0d59baef..5c3e5b25 100644
--- a/main.cpp
+++ b/main.cpp
@@ -27,16 +27,17 @@
 
 #include <getopt.h>
 
-#include <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
 
@@ -67,14 +68,10 @@ int main(int argc, char *argv[])
 	struct sr_context *sr_ctx = NULL;
 	const char *open_file = NULL;
 
-	QApplication a(argc, argv);
-
-	// Set some application metadata
-	QApplication::setApplicationVersion(PV_VERSION_STRING);
-	QApplication::setApplicationName("PulseView");
-	QApplication::setOrganizationDomain("sigrok.org");
+	Application a(argc, argv);
 
 #ifdef ANDROID
+	srau_init_environment();
 	pv::AndroidLogHandler::install_callbacks();
 #endif