mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-29 01:39:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Ronan Abhamon 2017-04-27 10:01:34 +02:00
parent 2acb7b8845
commit 3c66702873
3 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
linphone-desktop/src/app/App.cpp
View file

@ -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<TYPE>( \
"Linphone", 1, 0, NAME, \
[](QQmlEngine *, QJSEngine *) -> QObject *{ \

4
linphone-desktop/src/app/App.hpp
View file

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

2
linphone-desktop/ui/views/App/Main/About.qml
View file

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