Merge pull request #1239

4e6a421 Add Qt Runtime version to settings page
pull/2/head
luigi1111 6 years ago
commit b4353a31ac
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010

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

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