From 3c66702873e152f2af59e727b6a82dde7d08482d Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 27 Apr 2017 10:01:34 +0200 Subject: [PATCH] fix(ui/views/App/Main/About): use `Qt.application.version` instead of `App.version` --- linphone-desktop/src/app/App.cpp | 8 +------- linphone-desktop/src/app/App.hpp | 4 ---- linphone-desktop/ui/views/App/Main/About.qml | 2 +- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/linphone-desktop/src/app/App.cpp b/linphone-desktop/src/app/App.cpp index 848b3a3b8..e64225618 100644 --- a/linphone-desktop/src/app/App.cpp +++ b/linphone-desktop/src/app/App.cpp @@ -63,7 +63,7 @@ inline bool installLocale (App &app, QTranslator &translator, const QLocale &loc } App::App (int &argc, char *argv[]) : SingleApplication(argc, argv, true) { - setApplicationVersion("4.0"); + setApplicationVersion(LINPHONE_VERSION); setWindowIcon(QIcon(WINDOW_ICON_PATH)); // List available locales. @@ -257,12 +257,6 @@ bool App::hasFocus () const { // ----------------------------------------------------------------------------- -QString App::getVersion () const { - return ::Utils::linphoneStringToQString(LINPHONE_VERSION); -} - -// ----------------------------------------------------------------------------- - #define registerSharedSingletonType(TYPE, NAME, METHOD) qmlRegisterSingletonType( \ "Linphone", 1, 0, NAME, \ [](QQmlEngine *, QJSEngine *) -> QObject *{ \ diff --git a/linphone-desktop/src/app/App.hpp b/linphone-desktop/src/app/App.hpp index d96903b32..2c4fca871 100644 --- a/linphone-desktop/src/app/App.hpp +++ b/linphone-desktop/src/app/App.hpp @@ -37,8 +37,6 @@ class DefaultTranslator; class App : public SingleApplication { Q_OBJECT; - Q_PROPERTY(QString version READ getVersion CONSTANT); - Q_PROPERTY(QString configLocale READ getConfigLocale WRITE setConfigLocale NOTIFY configLocaleChanged); Q_PROPERTY(QString locale READ getLocale CONSTANT); Q_PROPERTY(QVariantList availableLocales READ getAvailableLocales CONSTANT); @@ -78,8 +76,6 @@ signals: void configLocaleChanged (const QString &locale); private: - QString getVersion () const; - void registerTypes (); void setTrayIcon (); diff --git a/linphone-desktop/ui/views/App/Main/About.qml b/linphone-desktop/ui/views/App/Main/About.qml index 58defb8ca..65af2f290 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 ' + App.version + text: 'Linphone Desktop ' + Qt.application.version height: parent.height / 2 width: parent.width