From 08c5aac21100fa21a5e6f7717885a5526fa7ea79 Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Fri, 16 Apr 2021 22:48:05 +0200
Subject: [PATCH] CI Archlinux fix : use a working image Add missing QML files

---
 .gitlab-ci.yml                                |  2 +-
 linphone-app/resources.qrc                    |  3 ++-
 .../App/Settings/Dialogs/SettingsLdapEdit.qml |  2 +-
 .../views/App/Settings/SettingsAdvanced.qml   | 20 +++++++++----------
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ba074cb2b..4ab5f9dc0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ variables:
   #CMAKE_OPTIONS: -DENABLE_LIME_X3DH=YES
 
 # Docker image version
-  ARCHLINUX_IMAGE_VERSION: 20210217_init
+  ARCHLINUX_IMAGE_VERSION: latestupdated
   CENTOS_7_QT_IMAGE_VERSION: 20210401_python3
   DEBIAN_9_QT_IMAGE_VERSION: 20210401_python3
   DEBIAN_10_IMAGE_VERSION: 20210217_python3
diff --git a/linphone-app/resources.qrc b/linphone-app/resources.qrc
index 8dec2d8bd..a65070a06 100644
--- a/linphone-app/resources.qrc
+++ b/linphone-app/resources.qrc
@@ -440,6 +440,7 @@
         <file>ui/views/App/Main/MainWindowMenuBar.qml</file>
         <file>ui/views/App/Main/MainWindow.qml</file>
         <file>ui/views/App/Main/MainWindowTopMenuBar.qml</file>
+        <file>ui/views/App/Settings/Dialogs/SettingsLdapEdit.qml</file>
         <file>ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.js</file>
         <file>ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.qml</file>
         <file>ui/views/App/Settings/Dialogs/SettingsVideoPreview.qml</file>
@@ -447,6 +448,7 @@
         <file>ui/views/App/Settings/SettingsAdvanced.qml</file>
         <file>ui/views/App/Settings/SettingsAudio.qml</file>
         <file>ui/views/App/Settings/SettingsCallsChat.qml</file>
+        <file>ui/views/App/Settings/SettingsLdap.qml</file>
         <file>ui/views/App/Settings/SettingsNetwork.qml</file>
         <file>ui/views/App/Settings/SettingsSipAccounts.js</file>
         <file>ui/views/App/Settings/SettingsSipAccounts.qml</file>
@@ -489,6 +491,5 @@
         <file>ui/dev-modules/Colors/Colors.qml</file>
         <file>ui/dev-modules/Units/Units.qml</file>
         <file>assets/icon.ico</file>
-        <file>ui/views/App/Settings/Dialogs/SettingsLdapEdit.qml</file>
     </qresource>
 </RCC>
diff --git a/linphone-app/ui/views/App/Settings/Dialogs/SettingsLdapEdit.qml b/linphone-app/ui/views/App/Settings/Dialogs/SettingsLdapEdit.qml
index 4ef4ab8f2..080b9b770 100644
--- a/linphone-app/ui/views/App/Settings/Dialogs/SettingsLdapEdit.qml
+++ b/linphone-app/ui/views/App/Settings/Dialogs/SettingsLdapEdit.qml
@@ -56,7 +56,7 @@ DialogPlus {
 							onTextChanged: ldapData.displayName = text
 							Keys.onReturnPressed:  nextItemInFocusChain().forceActiveFocus()
 							TooltipArea{
-								text : 'LDAP Server. eg: ldap:/// for a localhost server or ldap://ldap.example.org/'
+								text : 'The display name of the server to be shown in the list'
 							}
 						}
 					}
diff --git a/linphone-app/ui/views/App/Settings/SettingsAdvanced.qml b/linphone-app/ui/views/App/Settings/SettingsAdvanced.qml
index b444ecdc7..3353bb395 100644
--- a/linphone-app/ui/views/App/Settings/SettingsAdvanced.qml
+++ b/linphone-app/ui/views/App/Settings/SettingsAdvanced.qml
@@ -103,16 +103,16 @@ TabContainer {
 // -------------------------------------------------------------------------
 //								LDAP
 // -------------------------------------------------------------------------
-	Form {
-		title: 'LDAP'
-		width: parent.width
-		addButton:true
-		onAddButtonClicked:ldapSection.add()
-		SettingsLdap{
-			id:ldapSection
-			width: parent.width
-		}
-	}
+        Form {
+            title: 'LDAP'
+            width: parent.width
+            addButton:true
+            onAddButtonClicked:ldapSection.add()
+            SettingsLdap{
+                id:ldapSection
+                width: parent.width
+            }
+        }
 
 // -------------------------------------------------------------------------
 //							ADDRESS BOOK