monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-16 15:58:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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("qtRuntimeVersion", qVersion());
// Exclude daemon manager from IOS
#ifndef Q_OS_IOS
DaemonManager * daemonManager = DaemonManager::instance(&arguments);

2
pages/Settings.qml
View file

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