Merge pull request #1161

c8f0cf3 Stagenet
2018-03-26 12:57:14 -05:00
parent 278458bb64 c8f0cf3543
commit e4d75c6680
22 changed files with 161 additions and 112 deletions
--- a/main.cpp
+++ b/main.cpp
@@ -150,6 +150,9 @@ int main(int argc, char *argv[])
    qRegisterMetaType<TransactionInfo::Direction>();
    qRegisterMetaType<TransactionHistoryModel::TransactionInfoRole>();

+    qRegisterMetaType<NetworkType::Type>();
+    qmlRegisterType<NetworkType>("moneroComponents.NetworkType", 1, 0, "NetworkType");
+
 #ifdef WITH_SCANNER
    qmlRegisterType<QrCodeScanner>("moneroComponents.QRCodeScanner", 1, 0, "QRCodeScanner");
 #endif