diff options
| author | xiphon <xiphon@protonmail.com> | 2020-07-29 17:43:02 +0000 |
|---|---|---|
| committer | xiphon <xiphon@protonmail.com> | 2020-07-30 16:49:22 +0000 |
| commit | 43aeea8eb7965e41f18ae14f3cd3db5e41e77ed7 (patch) | |
| tree | 96849be20f3de69fc490433f1afa14165f115510 /src/main | |
| parent | 7eeda0a8f075a0d0938486cf0d7718d9d9491c20 (diff) | |
| download | monzero-gui-43aeea8eb7965e41f18ae14f3cd3db5e41e77ed7.tar.gz monzero-gui-43aeea8eb7965e41f18ae14f3cd3db5e41e77ed7.tar.xz monzero-gui-43aeea8eb7965e41f18ae14f3cd3db5e41e77ed7.zip | |
Network: instantiable QML type, introduce proxyAddress property
# Conflicts:
# main.qml
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/main.cpp | 4 |
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()) |