From e247b46b73d465105e3f32355d695e42281e91bc Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 5 May 2017 12:05:26 +0200 Subject: [PATCH] feat(ui/views/App/Main/About): display the Qt version --- linphone-desktop/src/app/App.hpp | 6 +++++- linphone-desktop/ui/views/App/Main/About.qml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/linphone-desktop/src/app/App.hpp b/linphone-desktop/src/app/App.hpp index 4d2430e6f..e995933f7 100644 --- a/linphone-desktop/src/app/App.hpp +++ b/linphone-desktop/src/app/App.hpp @@ -40,6 +40,7 @@ class App : public SingleApplication { Q_PROPERTY(QString configLocale READ getConfigLocale WRITE setConfigLocale NOTIFY configLocaleChanged); Q_PROPERTY(QString locale READ getLocale CONSTANT); Q_PROPERTY(QVariantList availableLocales READ getAvailableLocales CONSTANT); + Q_PROPERTY(QString qtVersion READ getQtVersion CONSTANT); public: App (int &argc, char *argv[]); @@ -70,7 +71,6 @@ public: } Q_INVOKABLE static void smartShowWindow (QQuickWindow *window); - Q_INVOKABLE static QString convertUrlToLocalPath (const QUrl &url); public slots: @@ -94,6 +94,10 @@ private: void openAppAfterInit (); + static QString getQtVersion () { + return qVersion(); + } + QCommandLineParser mParser; QVariantList mAvailableLocales; diff --git a/linphone-desktop/ui/views/App/Main/About.qml b/linphone-desktop/ui/views/App/Main/About.qml index 65af2f290..ad132ea82 100644 --- a/linphone-desktop/ui/views/App/Main/About.qml +++ b/linphone-desktop/ui/views/App/Main/About.qml @@ -52,7 +52,7 @@ DialogPlus { color: AboutStyle.versionsBlock.appVersion.color elide: Text.ElideRight font.pointSize: AboutStyle.versionsBlock.appVersion.fontSize - text: 'Linphone Desktop ' + Qt.application.version + text: 'Linphone Desktop Qt' + App.qtVersion + ' - ' + Qt.application.version height: parent.height / 2 width: parent.width