From 43aeea8eb7965e41f18ae14f3cd3db5e41e77ed7 Mon Sep 17 00:00:00 2001
From: xiphon <xiphon@protonmail.com>
Date: Wed, 29 Jul 2020 17:43:02 +0000
Subject: Network: instantiable QML type, introduce proxyAddress property

# Conflicts:
#	main.qml
---
 src/main/main.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/main')

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())
-- 
cgit v1.2.3