diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2018-04-08 17:54:20 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2018-04-08 17:54:20 -0500 |
| commit | b4353a31ac9cfabd348eb14b4f334918b2abc135 (patch) | |
| tree | 0a2f7f7706a5746b926c9087ed30857623ec4dd6 | |
| parent | a15f088e8b3f8004055fee81ee34d4edc65b3b16 (diff) | |
| parent | 4e6a4213ff44808edf1e13fc0d471b9deeceddec (diff) | |
| download | monzero-gui-b4353a31ac9cfabd348eb14b4f334918b2abc135.tar.gz monzero-gui-b4353a31ac9cfabd348eb14b4f334918b2abc135.tar.xz monzero-gui-b4353a31ac9cfabd348eb14b4f334918b2abc135.zip | |
Merge pull request #1239
4e6a421 Add Qt Runtime version to settings page
| -rw-r--r-- | main.cpp | 2 | ||||
| -rw-r--r-- | pages/Settings.qml | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -173,6 +173,8 @@ int main(int argc, char *argv[]) engine.rootContext()->setContextProperty("mainApp", &app); + engine.rootContext()->setContextProperty("qtRuntimeVersion", qVersion()); + // Exclude daemon manager from IOS #ifndef Q_OS_IOS DaemonManager * daemonManager = DaemonManager::instance(&arguments); diff --git a/pages/Settings.qml b/pages/Settings.qml index 553ec9d6..f19b1914 100644 --- a/pages/Settings.qml +++ b/pages/Settings.qml @@ -624,7 +624,7 @@ Rectangle { Layout.topMargin: 8 font.pixelSize: 14 Layout.fillWidth: true - text: qsTr("GUI version: ") + Version.GUI_VERSION + translationManager.emptyString + text: qsTr("GUI version: ") + Version.GUI_VERSION + " (Qt " + qtRuntimeVersion + ")" + translationManager.emptyString } TextBlock { id: guiMoneroVersion |