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
251db098
Commit
251db098
authored
Jun 28, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(App): supports only Qt5.9 now
parent
a67bd68a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
5 deletions
+3
-5
README.md
README.md
+1
-1
main.cpp
src/main.cpp
+1
-1
ComboBox.qml
ui/modules/Common/Form/ComboBox.qml
+1
-3
No files found.
README.md
View file @
251db098
...
@@ -8,7 +8,7 @@ Linphone is a free VoIP and video softphone based on the SIP protocol.
...
@@ -8,7 +8,7 @@ Linphone is a free VoIP and video softphone based on the SIP protocol.
Here are the general instructions to build linphone for desktop. The specific instructions for each build platform is described just below.
Here are the general instructions to build linphone for desktop. The specific instructions for each build platform is described just below.
1.
Install some build tools:
`CMake`
,
`Python`
and
`Qt5`
(_5.
8
or newer_).
1.
Install some build tools:
`CMake`
,
`Python`
and
`Qt5`
(_5.
9
or newer_).
2.
It's necessary to set the environment variable
`Qt5_DIR`
to point to the path containing the cmake folders of Qt5. Example:
2.
It's necessary to set the environment variable
`Qt5_DIR`
to point to the path containing the cmake folders of Qt5. Example:
Qt5_DIR="~/Qt/5.9/gcc_64/lib/cmake"
Qt5_DIR="~/Qt/5.9/gcc_64/lib/cmake"
...
...
src/main.cpp
View file @
251db098
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
// Must be unique. Used by `SingleApplication` and `Paths`.
// Must be unique. Used by `SingleApplication` and `Paths`.
#define APPLICATION_NAME "linphone"
#define APPLICATION_NAME "linphone"
#define APPLICATION_VERSION LINPHONE_QT_GIT_VERSION
#define APPLICATION_VERSION LINPHONE_QT_GIT_VERSION
#define APPLICATION_MINIMAL_QT_VERSION "5.
8
.0"
#define APPLICATION_MINIMAL_QT_VERSION "5.
9
.0"
#define DEFAULT_FONT "Noto Sans"
#define DEFAULT_FONT "Noto Sans"
...
...
ui/modules/Common/Form/ComboBox.qml
View file @
251db098
...
@@ -42,9 +42,7 @@ ComboBox {
...
@@ -42,9 +42,7 @@ ComboBox {
RowLayout
{
RowLayout
{
anchors
{
anchors
{
fill
:
parent
fill
:
parent
leftMargin
:
!
Utils
.
startsWith
(
App
.
qtVersion
,
'
5.8
'
)
leftMargin
:
ComboBoxStyle
.
contentItem
.
leftMargin
?
ComboBoxStyle
.
contentItem
.
leftMargin
// >= 5.9
:
0
// 5.8
}
}
spacing
:
ComboBoxStyle
.
contentItem
.
spacing
spacing
:
ComboBoxStyle
.
contentItem
.
spacing
...
...
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