projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Android: Use environment setup from library instead
[pulseview.git]
/
main.cpp
diff --git
a/main.cpp
b/main.cpp
index 0d59baef16847a8735f22b8f9e7ff081e1582e53..07d6dc3f8f7c308443c03032f967feea587b1b59 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-37,6
+37,7
@@
#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
@@
-75,6
+76,7
@@
int main(int argc, char *argv[])
QApplication::setOrganizationDomain("sigrok.org");
#ifdef ANDROID
QApplication::setOrganizationDomain("sigrok.org");
#ifdef ANDROID
+ srau_init_environment();
pv::AndroidLogHandler::install_callbacks();
#endif
pv::AndroidLogHandler::install_callbacks();
#endif