projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
android: Minor whitespace fixes.
[pulseview.git]
/
main.cpp
diff --git
a/main.cpp
b/main.cpp
index 23f3f62306c6a492b84d5e853c414f198248bde4..07d6dc3f8f7c308443c03032f967feea587b1b59 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-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[] = {