projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a build issue with std::roundf() on Android.
[pulseview.git]
/
main.cpp
diff --git
a/main.cpp
b/main.cpp
index 2119b81e50d778daf1ca3e2b6ba4fc09bd8b3f97..d0ca64a2483a85fb7cdac23c5a7170c1c3f02d34 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-27,6
+27,7
@@
#include <getopt.h>
#include <QDebug>
#include <getopt.h>
#include <QDebug>
+#include <QSettings>
#ifdef ENABLE_SIGNALS
#include "signalhandler.hpp"
#ifdef ENABLE_SIGNALS
#include "signalhandler.hpp"
@@
-120,6
+121,11
@@
int main(int argc, char *argv[])
srd_log_loglevel_set(loglevel);
#endif
srd_log_loglevel_set(loglevel);
#endif
+ if (loglevel >= 5) {
+ const QSettings settings;
+ qDebug() << "Settings:" << settings.fileName()
+ << "format" << settings.format();
+ }
break;
}
break;
}
@@
-136,10
+142,11
@@
int main(int argc, char *argv[])
if (argc - optind > 1) {
fprintf(stderr, "Only one file can be opened.\n");
return 1;
if (argc - optind > 1) {
fprintf(stderr, "Only one file can be opened.\n");
return 1;
- } else if (argc - optind == 1) {
- open_file = argv[argc - 1];
}
}
+ if (argc - optind == 1)
+ open_file = argv[argc - 1];
+
// Initialise libsigrok
context = sigrok::Context::create();
#ifdef ANDROID
// Initialise libsigrok
context = sigrok::Context::create();
#ifdef ANDROID