From 251db098d8e2d737b3f3535ed534c327399c7263 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 28 Jun 2017 18:42:45 +0200 Subject: [PATCH] feat(App): supports only Qt5.9 now --- README.md | 2 +- src/main.cpp | 2 +- ui/modules/Common/Form/ComboBox.qml | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b52b83264..7d32a52e3 100644 --- a/README.md +++ b/README.md @@ -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. -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: Qt5_DIR="~/Qt/5.9/gcc_64/lib/cmake" diff --git a/src/main.cpp b/src/main.cpp index 1e8be9848..36fdb5e30 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -31,7 +31,7 @@ // Must be unique. Used by `SingleApplication` and `Paths`. #define APPLICATION_NAME "linphone" #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" diff --git a/ui/modules/Common/Form/ComboBox.qml b/ui/modules/Common/Form/ComboBox.qml index c4e8450a4..e208714c6 100644 --- a/ui/modules/Common/Form/ComboBox.qml +++ b/ui/modules/Common/Form/ComboBox.qml @@ -42,9 +42,7 @@ ComboBox { RowLayout { anchors { fill: parent - leftMargin: !Utils.startsWith(App.qtVersion, '5.8') - ? ComboBoxStyle.contentItem.leftMargin // >= 5.9 - : 0 // 5.8 + leftMargin: ComboBoxStyle.contentItem.leftMargin } spacing: ComboBoxStyle.contentItem.spacing