diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-04-04 13:21:23 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-04-04 13:21:23 -0500 |
| commit | 86252506f01a8069ffbf01bed2ed8f44123c5233 (patch) | |
| tree | 44793693c4c2a849c4e461b4b8da353dee28a453 /src/main | |
| parent | aecd218d154d9dcccff9817f081b08e9b1b11a23 (diff) | |
| parent | 58987b2ec6e026881e88e844dc15e49a19b9a502 (diff) | |
| download | monzero-gui-86252506f01a8069ffbf01bed2ed8f44123c5233.tar.gz monzero-gui-86252506f01a8069ffbf01bed2ed8f44123c5233.tar.xz monzero-gui-86252506f01a8069ffbf01bed2ed8f44123c5233.zip | |
Merge pull request #2817
58987b2 network: provide common HTTP GET functionality with js callbacks (xiphon)
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/main.cpp b/src/main/main.cpp index c5210e5f..c6c0ea52 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -62,11 +62,11 @@ #include "Logger.h" #include "MainApp.h" #include "qt/ipc.h" +#include "qt/network.h" #include "qt/utils.h" #include "qt/TailsOS.h" #include "qt/KeysFiles.h" #include "qt/MoneroSettings.h" -#include "qt/prices.h" // IOS exclusions #ifndef Q_OS_IOS @@ -436,8 +436,8 @@ int main(int argc, char *argv[]) #endif engine.rootContext()->setContextProperty("builtWithScanner", builtWithScanner); - Prices prices; - engine.rootContext()->setContextProperty("Prices", &prices); + 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"))); |