Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
3c667028
Commit
3c667028
authored
Apr 27, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ui/views/App/Main/About): use `Qt.application.version` instead of `App.version`
parent
2acb7b88
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
12 deletions
+2
-12
App.cpp
linphone-desktop/src/app/App.cpp
+1
-7
App.hpp
linphone-desktop/src/app/App.hpp
+0
-4
About.qml
linphone-desktop/ui/views/App/Main/About.qml
+1
-1
No files found.
linphone-desktop/src/app/App.cpp
View file @
3c667028
...
...
@@ -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 *{ \
...
...
linphone-desktop/src/app/App.hpp
View file @
3c667028
...
...
@@ -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
();
...
...
linphone-desktop/ui/views/App/Main/About.qml
View file @
3c667028
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment