projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manual: allow manual conversion without source builds
[pulseview.git]
/
main.cpp
diff --git
a/main.cpp
b/main.cpp
index 455d7afd3d2b7e49f182da829437b0d459f785df..a77969ea7f72313e6c42b71cf0cd09980c53e0da 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-54,6
+54,7
@@
#include "pv/logging.hpp"
#include "pv/mainwindow.hpp"
#include "pv/session.hpp"
#include "pv/logging.hpp"
#include "pv/mainwindow.hpp"
#include "pv/session.hpp"
+#include "pv/util.hpp"
#ifdef ANDROID
#include <libsigrokandroidutils/libsigrokandroidutils.h>
#ifdef ANDROID
#include <libsigrokandroidutils/libsigrokandroidutils.h>
@@
-254,9
+255,12
@@
int main(int argc, char *argv[])
for (int i = 0; i < argc; i++)
open_files.emplace_back(argv[i]);
for (int i = 0; i < argc; i++)
open_files.emplace_back(argv[i]);
+ qRegisterMetaType<pv::util::Timestamp>("util::Timestamp");
+ qRegisterMetaType<uint64_t>("uint64_t");
+
// Prepare the global settings since logging needs them early on
pv::GlobalSettings settings;
// Prepare the global settings since logging needs them early on
pv::GlobalSettings settings;
- settings.save_
default_palette
();
+ settings.save_
internal_defaults
();
settings.set_defaults_where_needed();
settings.apply_theme();
settings.set_defaults_where_needed();
settings.apply_theme();