github/monero-gui
1
Fork 0
mirror of https://github.com/monero-project/monero-gui synced 2024-11-28 09:31:37 +01:00
Code Releases Activity

Merge pull request #1239

Browse Source 
4e6a421 Add Qt Runtime version to settings page
This commit is contained in:
luigi1111 2018-04-08 17:54:20 -05:00
commit b4353a31ac
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main.cpp
View File

@ -173,6 +173,8 @@ int main(int argc, char *argv[])
engine.rootContext()->setContextProperty("mainApp", &app); engine.rootContext()->setContextProperty("mainApp", &app);
engine.rootContext()->setContextProperty("qtRuntimeVersion", qVersion());
// Exclude daemon manager from IOS // Exclude daemon manager from IOS
#ifndef Q_OS_IOS #ifndef Q_OS_IOS
DaemonManager * daemonManager = DaemonManager::instance(&arguments); DaemonManager * daemonManager = DaemonManager::instance(&arguments);

2
pages/Settings.qml
View File

@ -624,7 +624,7 @@ Rectangle {
Layout.topMargin: 8 Layout.topMargin: 8
font.pixelSize: 14 font.pixelSize: 14
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("GUI version: ") + Version.GUI_VERSION + translationManager.emptyString text: qsTr("GUI version: ") + Version.GUI_VERSION + " (Qt " + qtRuntimeVersion + ")" + translationManager.emptyString
} }
TextBlock { TextBlock {
id: guiMoneroVersion id: guiMoneroVersion