From 6e440461c7a799e171aebe55b0dbcc5149b1e75c Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Mon, 12 Jun 2017 15:04:37 +0200
Subject: [PATCH] fix(ui/modules/Common/Form/ComboBox): deal correctly with
 `leftMargin` and Qt5.8

---
 linphone-desktop/ui/modules/Common/Form/ComboBox.qml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/linphone-desktop/ui/modules/Common/Form/ComboBox.qml b/linphone-desktop/ui/modules/Common/Form/ComboBox.qml
index 635a032ec..c4e8450a4 100644
--- a/linphone-desktop/ui/modules/Common/Form/ComboBox.qml
+++ b/linphone-desktop/ui/modules/Common/Form/ComboBox.qml
@@ -4,6 +4,8 @@ import QtQuick.Layouts 1.3
 
 import Common 1.0
 import Common.Styles 1.0
+import Linphone 1.0
+import Utils 1.0
 
 import 'ComboBox.js' as Logic
 
@@ -40,7 +42,9 @@ ComboBox {
     RowLayout {
       anchors {
         fill: parent
-        leftMargin: ComboBoxStyle.contentItem.leftMargin
+        leftMargin: !Utils.startsWith(App.qtVersion, '5.8')
+          ? ComboBoxStyle.contentItem.leftMargin // >= 5.9
+          : 0 // 5.8
       }
 
       spacing: ComboBoxStyle.contentItem.spacing