aboutsummaryrefslogtreecommitdiff
path: root/src/main/main.cpp
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2020-09-07 14:45:21 -0500
committerluigi1111 <luigi1111w@gmail.com>2020-09-07 14:45:21 -0500
commit2557bdb35f03dc11681cec797529eb93b668d782 (patch)
tree3cb7281eba15b9845492c2153fc8b2979abeaa56 /src/main/main.cpp
parent79a87ca03b2b0378fca9157b718815a3da9bab92 (diff)
parent43aeea8eb7965e41f18ae14f3cd3db5e41e77ed7 (diff)
downloadmonzero-gui-2557bdb35f03dc11681cec797529eb93b668d782.tar.gz
monzero-gui-2557bdb35f03dc11681cec797529eb93b668d782.tar.xz
monzero-gui-2557bdb35f03dc11681cec797529eb93b668d782.zip
Merge pull request #3030
43aeea8 Network: instantiable QML type, introduce proxyAddress property (xiphon)
Diffstat (limited to 'src/main/main.cpp')
-rw-r--r--src/main/main.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main/main.cpp b/src/main/main.cpp
index f5423940..25cb5296 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -357,6 +357,7 @@ Verify update binary using 'shasum'-compatible (SHA256 algo) output signed by tw
// registering types for QML
qmlRegisterType<clipboardAdapter>("moneroComponents.Clipboard", 1, 0, "Clipboard");
qmlRegisterType<Downloader>("moneroComponents.Downloader", 1, 0, "Downloader");
+ qmlRegisterType<Network>("moneroComponents.Network", 1, 0, "Network");
qmlRegisterType<WalletKeysFilesModel>("moneroComponents.WalletKeysFilesModel", 1, 0, "WalletKeysFilesModel");
qmlRegisterType<WalletManager>("moneroComponents.WalletManager", 1, 0, "WalletManager");
@@ -491,9 +492,6 @@ Verify update binary using 'shasum'-compatible (SHA256 algo) output signed by tw
engine.rootContext()->setContextProperty("moneroVersion", MONERO_VERSION_FULL);
- Network network;
- engine.rootContext()->setContextProperty("Network", &network);
-
// Load main window (context properties needs to be defined obove this line)
engine.load(QUrl(QStringLiteral("qrc:///main.qml")));
if (engine.rootObjects().isEmpty())