aboutsummaryrefslogtreecommitdiff
path: root/main.cpp
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2019-07-15 23:38:56 -0500
committerluigi1111 <luigi1111w@gmail.com>2019-07-15 23:38:56 -0500
commitcfec9dde968cb89f8fe5293958b82181348111ea (patch)
treeab10c28f94e90b00ca6a2484578640017584e4b5 /main.cpp
parent4370733b2b352f3dd8af7749a19754c7dc31f702 (diff)
parent96c99b250ed4557c1f396941614fb755a3487cb1 (diff)
downloadmonzero-gui-cfec9dde968cb89f8fe5293958b82181348111ea.tar.gz
monzero-gui-cfec9dde968cb89f8fe5293958b82181348111ea.tar.xz
monzero-gui-cfec9dde968cb89f8fe5293958b82181348111ea.zip
Merge pull request #2257
96c99b2 Replace Qt.labs.settings with MoneroSettings to allow for more customization (xmrdsc)
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/main.cpp b/main.cpp
index a51568d2..a41b3c75 100644
--- a/main.cpp
+++ b/main.cpp
@@ -66,6 +66,7 @@
#include "qt/utils.h"
#include "qt/mime.h"
#include "src/qt/KeysFiles.h"
+#include "src/qt/MoneroSettings.h"
#include "qt/prices.h"
// IOS exclusions
@@ -224,6 +225,9 @@ int main(int argc, char *argv[])
// registering types for QML
qmlRegisterType<clipboardAdapter>("moneroComponents.Clipboard", 1, 0, "Clipboard");
+ // Temporary Qt.labs.settings replacement
+ qmlRegisterType<MoneroSettings>("moneroComponents.Settings", 1, 0, "MoneroSettings");
+
qmlRegisterUncreatableType<Wallet>("moneroComponents.Wallet", 1, 0, "Wallet", "Wallet can't be instantiated directly");