projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Subclass QApplication to catch exceptions in handlers.
[pulseview.git]
/
main.cpp
diff --git
a/main.cpp
b/main.cpp
index 0d59baef16847a8735f22b8f9e7ff081e1582e53..5c3e5b25818ffc70d1ac28a347e9b33cb91bda47 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-27,16
+27,17
@@
#include <getopt.h>
#include <getopt.h>
-#include <QApplication>
#include <QDebug>
#ifdef ENABLE_SIGNALS
#include "signalhandler.h"
#endif
#include <QDebug>
#ifdef ENABLE_SIGNALS
#include "signalhandler.h"
#endif
+#include "pv/application.h"
#include "pv/devicemanager.h"
#include "pv/mainwindow.h"
#ifdef ANDROID
#include "pv/devicemanager.h"
#include "pv/mainwindow.h"
#ifdef ANDROID
+#include <libsigrokandroidutils/libsigrokandroidutils.h>
#include "android/loghandler.h"
#endif
#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;
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
#ifdef ANDROID
+ srau_init_environment();
pv::AndroidLogHandler::install_callbacks();
#endif
pv::AndroidLogHandler::install_callbacks();
#endif