mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-02-07 15:08:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

CI Archlinux fix : use a working image

Browse source 
Add missing QML files
This commit is contained in:
Julien Wadel 2021-04-16 22:48:05 +02:00
parent 65689adb34
commit 08c5aac211
4 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -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

3
linphone-app/resources.qrc
View file

@ -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>

2
linphone-app/ui/views/App/Settings/Dialogs/SettingsLdapEdit.qml
View file

@ -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'
}
}
}

20
linphone-app/ui/views/App/Settings/SettingsAdvanced.qml
View file

@ -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