aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorxiphon <xiphon@protonmail.com>2020-07-10 13:37:04 +0000
committerxiphon <xiphon@protonmail.com>2020-07-15 03:45:03 +0000
commit36262f029accbf486d2c8dad5c2115a3c40615b4 (patch)
tree7cd12f98a45dda2b79aaa3b3ab2dbd902613ac32 /src
parentc137a6ea36040aee20366933935805eff67ae3f8 (diff)
downloadmonzero-gui-36262f029accbf486d2c8dad5c2115a3c40615b4.tar.gz
monzero-gui-36262f029accbf486d2c8dad5c2115a3c40615b4.tar.xz
monzero-gui-36262f029accbf486d2c8dad5c2115a3c40615b4.zip
version: use MONERO_VERSION_FULL const as monero core version
Diffstat (limited to 'src')
-rw-r--r--src/main/main.cpp5
-rw-r--r--src/version.js.in1
2 files changed, 5 insertions, 1 deletions
diff --git a/src/main/main.cpp b/src/main/main.cpp
index 41b41faa..6b01dfc9 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -38,6 +38,9 @@
#include <QScreen>
#include <QRegExp>
#include <QThread>
+
+#include <version.h>
+
#include "clipboardAdapter.h"
#include "filter.h"
#include "oscursor.h"
@@ -499,6 +502,8 @@ Verify update binary using 'shasum'-compatible (SHA256 algo) output signed by tw
#endif
engine.rootContext()->setContextProperty("builtWithScanner", builtWithScanner);
+ engine.rootContext()->setContextProperty("moneroVersion", MONERO_VERSION_FULL);
+
Network network;
engine.rootContext()->setContextProperty("Network", &network);
diff --git a/src/version.js.in b/src/version.js.in
index 66f92852..dab4a07e 100644
--- a/src/version.js.in
+++ b/src/version.js.in
@@ -1,2 +1 @@
var GUI_VERSION = "@VERSION_TAG_GUI@";
-var GUI_MONERO_VERSION = "@VERSION_TAG_CORE@";