Commit 3c667028 authored by Ronan Abhamon's avatar Ronan Abhamon

fix(ui/views/App/Main/About): use `Qt.application.version` instead of `App.version`

parent 2acb7b88
...@@ -63,7 +63,7 @@ inline bool installLocale (App &app, QTranslator &translator, const QLocale &loc ...@@ -63,7 +63,7 @@ inline bool installLocale (App &app, QTranslator &translator, const QLocale &loc
} }
App::App (int &argc, char *argv[]) : SingleApplication(argc, argv, true) { App::App (int &argc, char *argv[]) : SingleApplication(argc, argv, true) {
setApplicationVersion("4.0"); setApplicationVersion(LINPHONE_VERSION);
setWindowIcon(QIcon(WINDOW_ICON_PATH)); setWindowIcon(QIcon(WINDOW_ICON_PATH));
// List available locales. // List available locales.
...@@ -257,12 +257,6 @@ bool App::hasFocus () const { ...@@ -257,12 +257,6 @@ bool App::hasFocus () const {
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
QString App::getVersion () const {
return ::Utils::linphoneStringToQString(LINPHONE_VERSION);
}
// -----------------------------------------------------------------------------
#define registerSharedSingletonType(TYPE, NAME, METHOD) qmlRegisterSingletonType<TYPE>( \ #define registerSharedSingletonType(TYPE, NAME, METHOD) qmlRegisterSingletonType<TYPE>( \
"Linphone", 1, 0, NAME, \ "Linphone", 1, 0, NAME, \
[](QQmlEngine *, QJSEngine *) -> QObject *{ \ [](QQmlEngine *, QJSEngine *) -> QObject *{ \
......
...@@ -37,8 +37,6 @@ class DefaultTranslator; ...@@ -37,8 +37,6 @@ class DefaultTranslator;
class App : public SingleApplication { class App : public SingleApplication {
Q_OBJECT; Q_OBJECT;
Q_PROPERTY(QString version READ getVersion CONSTANT);
Q_PROPERTY(QString configLocale READ getConfigLocale WRITE setConfigLocale NOTIFY configLocaleChanged); Q_PROPERTY(QString configLocale READ getConfigLocale WRITE setConfigLocale NOTIFY configLocaleChanged);
Q_PROPERTY(QString locale READ getLocale CONSTANT); Q_PROPERTY(QString locale READ getLocale CONSTANT);
Q_PROPERTY(QVariantList availableLocales READ getAvailableLocales CONSTANT); Q_PROPERTY(QVariantList availableLocales READ getAvailableLocales CONSTANT);
...@@ -78,8 +76,6 @@ signals: ...@@ -78,8 +76,6 @@ signals:
void configLocaleChanged (const QString &locale); void configLocaleChanged (const QString &locale);
private: private:
QString getVersion () const;
void registerTypes (); void registerTypes ();
void setTrayIcon (); void setTrayIcon ();
......
...@@ -52,7 +52,7 @@ DialogPlus { ...@@ -52,7 +52,7 @@ DialogPlus {
color: AboutStyle.versionsBlock.appVersion.color color: AboutStyle.versionsBlock.appVersion.color
elide: Text.ElideRight elide: Text.ElideRight
font.pointSize: AboutStyle.versionsBlock.appVersion.fontSize font.pointSize: AboutStyle.versionsBlock.appVersion.fontSize
text: 'Linphone Desktop ' + App.version text: 'Linphone Desktop ' + Qt.application.version
height: parent.height / 2 height: parent.height / 2
width: parent.width width: parent.width
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment