Merge pull request #3004

36262f0 version: use MONERO_VERSION_FULL const as monero core version (xiphon)
This commit is contained in:
luigi1111
2020-07-29 09:42:24 -05:00
6 changed files with 15 additions and 14 deletions

View File

@@ -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);

View File

@@ -1,2 +1 @@
var GUI_VERSION = "@VERSION_TAG_GUI@";
var GUI_MONERO_VERSION = "@VERSION_TAG_CORE@";