projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Usage of std::thread requires linking with appropriate system thread library.
[pulseview.git]
/
main.cpp
diff --git
a/main.cpp
b/main.cpp
index 23f3f62306c6a492b84d5e853c414f198248bde4..5c3e5b25818ffc70d1ac28a347e9b33cb91bda47 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-27,15
+27,19
@@
#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"
#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"
@@
-64,12
+68,12
@@
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;
-
Q
Application a(argc, argv);
+ Application a(argc, argv);
- // Set some application metadata
-
QApplication::setApplicationVersion(PV_VERSION_STRING
);
-
QApplication::setApplicationName("PulseView"
);
- QApplication::setOrganizationDomain("sigrok.org");
+#ifdef ANDROID
+
srau_init_environment(
);
+
pv::AndroidLogHandler::install_callbacks(
);
+#endif
// Parse arguments
while (1) {
// Parse arguments
while (1) {