From 60d204aeadd37e40ff7f019f9159f3deaeed6db4 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Tue, 24 Mar 2020 22:44:59 +0100 Subject: [PATCH 01/20] Move folders --- build_all_linux.sh | 56 ---- build_all_macos.sh | 55 ---- build_all_win.bat | 22 -- .../application_info.cmake | 0 .../assets}/app-icon.rc | 0 .../assistant/create-app-sip-account.rc | 0 .../assets}/assistant/use-app-sip-account.rc | 0 .../assistant/use-other-sip-account.rc | 0 .../fonts/NotoSans-hinted/LICENSE_OFL.txt | 0 .../fonts/NotoSans-hinted/NotoSans-Bold.ttf | Bin .../NotoSans-hinted/NotoSans-BoldItalic.ttf | Bin .../fonts/NotoSans-hinted/NotoSans-Italic.ttf | Bin .../NotoSans-hinted/NotoSans-Regular.ttf | Bin .../fonts/NotoSans-hinted/NotoSansUI-Bold.ttf | Bin .../NotoSans-hinted/NotoSansUI-BoldItalic.ttf | Bin .../NotoSans-hinted/NotoSansUI-Italic.ttf | Bin .../NotoSans-hinted/NotoSansUI-Regular.ttf | Bin .../assets}/fonts/NotoSans-hinted/README | 0 {assets => linphone-desktop/assets}/icon.ico | Bin .../assets}/icons/genicons.sh | 0 .../assets}/icons/genicons_1.0.sh | 0 .../icons/hicolor/128x128/apps/icon.png | Bin .../assets}/icons/hicolor/16x16/apps/icon.png | Bin .../assets}/icons/hicolor/22x22/apps/icon.png | Bin .../assets}/icons/hicolor/24x24/apps/icon.png | Bin .../icons/hicolor/256x256/apps/icon.png | Bin .../assets}/icons/hicolor/32x32/apps/icon.png | Bin .../assets}/icons/hicolor/64x64/apps/icon.png | Bin .../assets}/images/add_disabled.svg | 0 .../assets}/images/add_hovered.svg | 0 .../assets}/images/add_normal.svg | 0 .../assets}/images/add_pressed.svg | 0 .../assets}/images/attachment_disabled.svg | 0 .../assets}/images/attachment_hovered.svg | 0 .../assets}/images/attachment_normal.svg | 0 .../assets}/images/attachment_pressed.svg | 0 .../assets}/images/auto_answer.svg | 0 .../assets}/images/burger_menu_hovered.svg | 0 .../images/burger_menu_light_hovered.svg | 0 .../images/burger_menu_light_normal.svg | 0 .../images/burger_menu_light_pressed.svg | 0 .../assets}/images/burger_menu_normal.svg | 0 .../assets}/images/burger_menu_pressed.svg | 0 .../assets}/images/call_accept_hovered.svg | 0 .../assets}/images/call_accept_normal.svg | 0 .../assets}/images/call_accept_pressed.svg | 0 .../images/call_chat_secure_hovered.svg | 0 .../images/call_chat_secure_normal.svg | 0 .../images/call_chat_secure_pressed.svg | 0 .../images/call_chat_unsecure_hovered.svg | 0 .../images/call_chat_unsecure_normal.svg | 0 .../images/call_chat_unsecure_pressed.svg | 0 .../assets}/images/call_hovered.svg | 0 .../assets}/images/call_normal.svg | 0 .../assets}/images/call_pressed.svg | 0 .../assets}/images/call_quality_0.svg | 0 .../assets}/images/call_quality_1.svg | 0 .../assets}/images/call_quality_2.svg | 0 .../assets}/images/call_quality_3.svg | 0 .../assets}/images/call_sign_connected.svg | 0 .../assets}/images/call_sign_ended.svg | 0 .../assets}/images/call_sign_incoming.svg | 0 .../assets}/images/call_sign_outgoing.svg | 0 .../assets}/images/call_sign_paused.svg | 0 .../assets}/images/camera.svg | 0 .../assets}/images/camera_off_hovered.svg | 0 .../assets}/images/camera_off_normal.svg | 0 .../assets}/images/camera_off_pressed.svg | 0 .../assets}/images/camera_off_updating.svg | 0 .../assets}/images/camera_on_hovered.svg | 0 .../assets}/images/camera_on_normal.svg | 0 .../assets}/images/camera_on_pressed.svg | 0 .../assets}/images/camera_on_updating.svg | 0 .../assets}/images/cancel_hovered.svg | 0 .../assets}/images/cancel_normal.svg | 0 .../assets}/images/cancel_pressed.svg | 0 .../assets}/images/chat_amount.svg | 0 .../assets}/images/chat_count.svg | 0 .../assets}/images/chat_delivered.svg | 0 .../assets}/images/chat_error.svg | 0 .../assets}/images/chat_hovered.svg | 0 .../assets}/images/chat_is_composing_0.svg | 0 .../assets}/images/chat_is_composing_1.svg | 0 .../assets}/images/chat_is_composing_2.svg | 0 .../assets}/images/chat_is_composing_3.svg | 0 .../assets}/images/chat_normal.svg | 0 .../assets}/images/chat_pressed.svg | 0 .../assets}/images/chat_read.svg | 0 .../assets}/images/collapse.svg | 0 .../assets}/images/contact_add.svg | 0 .../assets}/images/contact_add_hovered.svg | 0 .../assets}/images/contact_add_normal.svg | 0 .../assets}/images/contact_add_pressed.svg | 0 .../images/contact_card_photo_disabled.svg | 0 .../images/contact_card_photo_hovered.svg | 0 .../images/contact_card_photo_normal.svg | 0 .../images/contact_card_photo_pressed.svg | 0 .../assets}/images/contact_edit_hovered.svg | 0 .../assets}/images/contact_edit_normal.svg | 0 .../assets}/images/contact_edit_pressed.svg | 0 .../assets}/images/contact_normal.svg | 0 .../assets}/images/contact_selected.svg | 0 .../assets}/images/declined_incoming_call.svg | 0 .../assets}/images/declined_outgoing_call.svg | 0 .../assets}/images/delete_hovered.svg | 0 .../assets}/images/delete_normal.svg | 0 .../assets}/images/delete_pressed.svg | 0 .../assets}/images/download.svg | 0 .../assets}/images/drop_down.svg | 0 .../assets}/images/edit_hovered.svg | 0 .../assets}/images/edit_normal.svg | 0 .../assets}/images/edit_pressed.svg | 0 .../assets}/images/ended_call.svg | 0 .../assets}/images/file_hovered.svg | 0 .../assets}/images/file_normal.svg | 0 .../assets}/images/file_pressed.svg | 0 .../assets}/images/file_sign.svg | 0 .../assets}/images/filter.svg | 0 .../assets}/images/folder_hovered.svg | 0 .../assets}/images/folder_normal.svg | 0 .../assets}/images/folder_pressed.svg | 0 .../assets}/images/fullscreen_hovered.svg | 0 .../assets}/images/fullscreen_normal.svg | 0 .../assets}/images/fullscreen_pressed.svg | 0 .../assets}/images/generic_error.svg | 0 .../assets}/images/generic_error_hovered.svg | 0 .../assets}/images/generic_error_normal.svg | 0 .../assets}/images/generic_error_pressed.svg | 0 .../assets}/images/hangup_hovered.svg | 0 .../assets}/images/hangup_normal.svg | 0 .../assets}/images/hangup_pressed.svg | 0 .../assets}/images/history.svg | 0 .../assets}/images/history_hovered.svg | 0 .../assets}/images/history_normal.svg | 0 .../assets}/images/history_pressed.svg | 0 .../assets}/images/home_account_assistant.svg | 0 .../assets}/images/home_invite_friends.svg | 0 .../assets}/images/home_normal.svg | 0 .../assets}/images/home_selected.svg | 0 .../assets}/images/home_use_linphone.svg | 0 .../assets}/images/incoming_call.svg | 0 .../assets}/images/led_green.svg | 0 .../assets}/images/led_orange.svg | 0 .../assets}/images/led_red.svg | 0 .../assets}/images/led_white.svg | 0 .../assets}/images/linphone_logo.svg | 0 .../assets}/images/message_sign.svg | 0 .../assets}/images/micro.svg | 0 .../assets}/images/micro_off_hovered.svg | 0 .../assets}/images/micro_off_normal.svg | 0 .../assets}/images/micro_off_pressed.svg | 0 .../assets}/images/micro_on_hovered.svg | 0 .../assets}/images/micro_on_normal.svg | 0 .../assets}/images/micro_on_pressed.svg | 0 .../assets}/images/missed_incoming_call.svg | 0 .../assets}/images/missed_outgoing_call.svg | 0 .../assets}/images/new_call_hovered.svg | 0 .../assets}/images/new_call_normal.svg | 0 .../assets}/images/new_call_pressed.svg | 0 .../assets}/images/new_conference_hovered.svg | 0 .../assets}/images/new_conference_normal.svg | 0 .../assets}/images/new_conference_pressed.svg | 0 .../assets}/images/options_hovered.svg | 0 .../assets}/images/options_normal.svg | 0 .../assets}/images/options_pressed.svg | 0 .../assets}/images/outgoing_call.svg | 0 .../assets}/images/pause_off_hovered.svg | 0 .../assets}/images/pause_off_normal.svg | 0 .../assets}/images/pause_off_pressed.svg | 0 .../assets}/images/pause_off_updating.svg | 0 .../assets}/images/pause_on_hovered.svg | 0 .../assets}/images/pause_on_normal.svg | 0 .../assets}/images/pause_on_pressed.svg | 0 .../assets}/images/pause_on_updating.svg | 0 .../assets}/images/record_off.svg | 0 .../assets}/images/record_on.svg | 0 .../assets}/images/recording_sign.svg | 0 .../assets}/images/screenshot_hovered.svg | 0 .../assets}/images/screenshot_normal.svg | 0 .../assets}/images/screenshot_pressed.svg | 0 .../assets}/images/search.svg | 0 .../images/settings_advanced_normal.svg | 0 .../images/settings_advanced_selected.svg | 0 .../assets}/images/settings_audio_normal.svg | 0 .../images/settings_audio_selected.svg | 0 .../assets}/images/settings_call_normal.svg | 0 .../assets}/images/settings_call_selected.svg | 0 .../images/settings_network_normal.svg | 0 .../images/settings_network_selected.svg | 0 .../images/settings_sip_accounts_normal.svg | 0 .../images/settings_sip_accounts_selected.svg | 0 .../assets}/images/settings_video_normal.svg | 0 .../images/settings_video_selected.svg | 0 .../assets}/images/snapshot_sign.svg | 0 .../assets}/images/speaker.svg | 0 .../assets}/images/speaker_off_hovered.svg | 0 .../assets}/images/speaker_off_normal.svg | 0 .../assets}/images/speaker_off_pressed.svg | 0 .../assets}/images/speaker_on_hovered.svg | 0 .../assets}/images/speaker_on_normal.svg | 0 .../assets}/images/speaker_on_pressed.svg | 0 .../assets}/images/tel_keypad_hovered.svg | 0 .../assets}/images/tel_keypad_normal.svg | 0 .../assets}/images/tel_keypad_pressed.svg | 0 .../assets}/images/timeline_history.svg | 0 .../assets}/images/tooltip_arrow_bottom.svg | 0 .../assets}/images/tooltip_arrow_left.svg | 0 .../assets}/images/tooltip_arrow_right.svg | 0 .../assets}/images/tooltip_arrow_top.svg | 0 .../assets}/images/transfer_hovered.svg | 0 .../assets}/images/transfer_normal.svg | 0 .../assets}/images/transfer_pressed.svg | 0 .../assets}/images/update_sign.svg | 0 .../images/video_call_accept_hovered.svg | 0 .../images/video_call_accept_normal.svg | 0 .../images/video_call_accept_pressed.svg | 0 .../assets}/images/video_call_hovered.svg | 0 .../assets}/images/video_call_normal.svg | 0 .../assets}/images/video_call_pressed.svg | 0 .../assets}/images/warning.svg | 0 .../assets}/languages/CMakeLists.txt | 0 .../assets}/languages/ar.ts | 0 .../assets}/languages/az.ts | 0 .../assets}/languages/az@latin.ts | 0 .../assets}/languages/cs.ts | 0 .../assets}/languages/de.ts | 0 .../assets}/languages/de_DE.ts | 0 .../assets}/languages/el.ts | 0 .../assets}/languages/en.ts | 0 .../assets}/languages/es.ts | 0 .../assets}/languages/es_AR.ts | 0 .../assets}/languages/fi.ts | 0 .../assets}/languages/fr_FR.ts | 0 .../assets}/languages/he.ts | 0 .../assets}/languages/hu.ts | 0 .../assets}/languages/it.ts | 0 .../assets}/languages/ja.ts | 0 .../assets}/languages/ka.ts | 0 .../assets}/languages/ko_KR.ts | 0 .../assets}/languages/lt.ts | 0 .../assets}/languages/mk_MK.ts | 0 .../assets}/languages/nb_NO.ts | 0 .../assets}/languages/nl.ts | 0 .../assets}/languages/pl.ts | 0 .../assets}/languages/pl_PL.ts | 0 .../assets}/languages/pt_BR.ts | 0 .../assets}/languages/ru.ts | 0 .../assets}/languages/ru_RU.ts | 0 .../assets}/languages/sr.ts | 0 .../assets}/languages/sv.ts | 0 .../assets}/languages/tr.ts | 0 .../assets}/languages/uk.ts | 0 .../assets}/languages/zh-Hant.ts | 0 .../assets}/languages/zh.ts | 0 .../assets}/languages/zh_CN.GB2312.ts | 0 .../assets}/languages/zh_CN.ts | 0 .../assets}/languages/zh_TW.ts | 0 .../assets}/linphone.desktop.cmake | 0 .../assets}/linphonerc-factory | 0 .../build}/CMakeLists.txt | 0 .../build}/rpm/linphone.spec.cmake | 0 .../build}/rpm/qt5.spec | 0 .../cmake}/FindMinizip.cmake | 0 .../cmake_builder}/CMakeLists.txt | 0 .../cmake_builder}/additional_steps.cmake | 0 .../cmake_builder}/install.cmake | 0 .../linphone_package/CMakeLists.txt | 0 .../linphone_package/macos/Info.plist.in | 0 .../linphone_package/macos/background_dmg.jpg | Bin .../linphone_package/macos/linphone.icns | Bin .../macos/linphone_dmg.scpt.in | 0 .../linphone_package/macos/packaging.cmake.in | 0 .../sdk_content/antlr3c.list.in | 0 .../sdk_content/bctoolbox.list.in | 0 .../sdk_content/bcunit.list.in | 0 .../sdk_content/bellesip.list.in | 0 .../linphone_package/sdk_content/bv16.list.in | 0 .../sdk_content/bzrtp.list.in | 0 .../sdk_content/ffmpeg.list.in | 0 .../linphone_package/sdk_content/gsm.list.in | 0 .../sdk_content/linphone.list.in | 0 .../sdk_content/linphonecxx.list.in | 0 .../sdk_content/mbedtls.list.in | 0 .../linphone_package/sdk_content/ms2.list.in | 0 .../sdk_content/ms2plugins.list.in | 0 .../linphone_package/sdk_content/opus.list.in | 0 .../linphone_package/sdk_content/ortp.list.in | 0 .../sdk_content/polarssl.list.in | 0 .../sdk_content/speex.list.in | 0 .../sdk_content/sqlite3.list.in | 0 .../linphone_package/sdk_content/srtp.list.in | 0 .../sdk_content/vcard.list.in | 0 .../linphone_package/sdk_content/xml2.list.in | 0 .../linphone_package/sdk_content/zlib.list.in | 0 .../linphone_package/windows/NSIS.template.in | 0 .../linphone_package/windows/install.nsi.in | 0 .../linphone_package/windows/nsis_banner.bmp | Bin .../windows/packaging.cmake.in | 0 .../linphone_package/windows/signtool.py | 0 .../linphone_package/windows/uninstall.nsi.in | 0 .../windows/winshortcut.vbs.in | 0 .../cmake_builder}/linphoneqt.cmake | 0 .../resources.qrc | 0 {src => linphone-desktop/src}/app/App.cpp | 0 {src => linphone-desktop/src}/app/App.hpp | 0 .../src}/app/AppController.cpp | 0 .../src}/app/AppController.hpp | 0 {src => linphone-desktop/src}/app/cli/Cli.cpp | 0 {src => linphone-desktop/src}/app/cli/Cli.hpp | 0 .../src}/app/logger/Logger.cpp | 0 .../src}/app/logger/Logger.hpp | 0 {src => linphone-desktop/src}/app/main.cpp | 0 .../src}/app/paths/Paths.cpp | 0 .../src}/app/paths/Paths.hpp | 0 .../src}/app/providers/AvatarProvider.cpp | 0 .../src}/app/providers/AvatarProvider.hpp | 0 .../src}/app/providers/ImageProvider.cpp | 0 .../src}/app/providers/ImageProvider.hpp | 0 .../src}/app/providers/ThumbnailProvider.cpp | 0 .../src}/app/providers/ThumbnailProvider.hpp | 0 .../single-application/SingleApplication.cpp | 0 .../single-application/SingleApplication.hpp | 0 .../SingleApplicationDBus.cpp | 0 .../SingleApplicationDBusPrivate.hpp | 0 .../SingleApplicationPrivate.hpp | 0 .../src}/app/translator/DefaultTranslator.cpp | 0 .../src}/app/translator/DefaultTranslator.hpp | 0 .../src}/components/Components.hpp | 0 .../components/assistant/AssistantModel.cpp | 0 .../components/assistant/AssistantModel.hpp | 0 .../authentication/AuthenticationNotifier.cpp | 0 .../authentication/AuthenticationNotifier.hpp | 0 .../src}/components/call/CallModel.cpp | 0 .../src}/components/call/CallModel.hpp | 0 .../src}/components/calls/CallsListModel.cpp | 0 .../src}/components/calls/CallsListModel.hpp | 0 .../components/calls/CallsListProxyModel.cpp | 0 .../components/calls/CallsListProxyModel.hpp | 0 .../src}/components/camera/Camera.cpp | 0 .../src}/components/camera/Camera.hpp | 0 .../src}/components/camera/CameraPreview.cpp | 0 .../src}/components/camera/CameraPreview.hpp | 0 .../src}/components/camera/MSFunctions.cpp | 0 .../src}/components/camera/MSFunctions.hpp | 0 .../src}/components/chat/ChatModel.cpp | 0 .../src}/components/chat/ChatModel.hpp | 0 .../src}/components/chat/ChatProxyModel.cpp | 0 .../src}/components/chat/ChatProxyModel.hpp | 0 .../components/codecs/AbstractCodecsModel.cpp | 0 .../components/codecs/AbstractCodecsModel.hpp | 0 .../components/codecs/AudioCodecsModel.cpp | 0 .../components/codecs/AudioCodecsModel.hpp | 0 .../components/codecs/VideoCodecsModel.cpp | 0 .../components/codecs/VideoCodecsModel.hpp | 0 .../conference/ConferenceAddModel.cpp | 0 .../conference/ConferenceAddModel.hpp | 0 .../conference/ConferenceHelperModel.cpp | 0 .../conference/ConferenceHelperModel.hpp | 0 .../components/conference/ConferenceModel.cpp | 0 .../components/conference/ConferenceModel.hpp | 0 .../src}/components/contact/ContactModel.cpp | 0 .../src}/components/contact/ContactModel.hpp | 0 .../src}/components/contact/VcardModel.cpp | 0 .../src}/components/contact/VcardModel.hpp | 0 .../components/contacts/ContactsListModel.cpp | 0 .../components/contacts/ContactsListModel.hpp | 0 .../contacts/ContactsListProxyModel.cpp | 0 .../contacts/ContactsListProxyModel.hpp | 0 .../src}/components/core/CoreHandlers.cpp | 0 .../src}/components/core/CoreHandlers.hpp | 0 .../src}/components/core/CoreManager.cpp | 0 .../src}/components/core/CoreManager.hpp | 0 .../AbstractEventCountNotifier.cpp | 0 .../AbstractEventCountNotifier.hpp | 0 .../EventCountNotifierMacOs.hpp | 0 .../EventCountNotifierMacOs.m | 0 .../EventCountNotifierSystemTrayIcon.cpp | 0 .../EventCountNotifierSystemTrayIcon.hpp | 0 .../src}/components/file/FileDownloader.cpp | 0 .../src}/components/file/FileDownloader.hpp | 0 .../src}/components/file/FileExtractor.cpp | 0 .../src}/components/file/FileExtractor.hpp | 0 .../src}/components/notifier/Notifier.cpp | 0 .../src}/components/notifier/Notifier.hpp | 0 .../components/other/clipboard/Clipboard.cpp | 0 .../components/other/clipboard/Clipboard.hpp | 0 .../src}/components/other/colors/Colors.cpp | 0 .../src}/components/other/colors/Colors.hpp | 0 .../other/desktop-tools/DesktopTools.hpp | 0 .../other/desktop-tools/DesktopToolsLinux.cpp | 0 .../other/desktop-tools/DesktopToolsLinux.hpp | 0 .../other/desktop-tools/DesktopToolsMacOs.cpp | 0 .../other/desktop-tools/DesktopToolsMacOs.hpp | 0 .../desktop-tools/DesktopToolsWindows.cpp | 0 .../desktop-tools/DesktopToolsWindows.hpp | 0 .../screen-saver/ScreenSaverDBus.cpp | 0 .../screen-saver/ScreenSaverDBus.hpp | 0 .../screen-saver/ScreenSaverMacOs.m | 0 .../screen-saver/ScreenSaverXdg.cpp | 0 .../screen-saver/ScreenSaverXdg.hpp | 0 .../state-process/StateProcessMacOs.mm | 0 .../other/text-to-speech/TextToSpeech.cpp | 0 .../other/text-to-speech/TextToSpeech.hpp | 0 .../src}/components/other/units/Units.cpp | 0 .../src}/components/other/units/Units.hpp | 0 .../components/presence/OwnPresenceModel.cpp | 0 .../components/presence/OwnPresenceModel.hpp | 0 .../src}/components/presence/Presence.cpp | 0 .../src}/components/presence/Presence.hpp | 0 .../settings/AccountSettingsModel.cpp | 0 .../settings/AccountSettingsModel.hpp | 0 .../components/settings/SettingsModel.cpp | 0 .../components/settings/SettingsModel.hpp | 0 .../sip-addresses/SipAddressObserver.cpp | 0 .../sip-addresses/SipAddressObserver.hpp | 0 .../sip-addresses/SipAddressesModel.cpp | 0 .../sip-addresses/SipAddressesModel.hpp | 0 .../sip-addresses/SipAddressesProxyModel.cpp | 0 .../sip-addresses/SipAddressesProxyModel.hpp | 0 .../components/sound-player/SoundPlayer.cpp | 0 .../components/sound-player/SoundPlayer.hpp | 0 .../TelephoneNumbersModel.cpp | 0 .../TelephoneNumbersModel.hpp | 0 .../components/timeline/TimelineModel.cpp | 0 .../components/timeline/TimelineModel.hpp | 0 .../components/url-handlers/UrlHandlers.cpp | 0 .../components/url-handlers/UrlHandlers.hpp | 0 {src => linphone-desktop/src}/config.h.cmake | 0 .../src}/utils/LinphoneUtils.cpp | 0 .../src}/utils/LinphoneUtils.hpp | 0 .../src}/utils/MediastreamerUtils.cpp | 0 .../src}/utils/MediastreamerUtils.hpp | 0 .../src}/utils/QExifImageHeader.cpp | 0 .../src}/utils/QExifImageHeader.hpp | 0 {src => linphone-desktop/src}/utils/Utils.cpp | 0 {src => linphone-desktop/src}/utils/Utils.hpp | 0 .../tools}/build_qt_rpm | 0 .../tools}/check_qml_syntax | 0 .../tools}/private/pre-commit | 0 {tools => linphone-desktop/tools}/test_qml | 0 .../tools}/update_resources | 0 .../ui}/dev-modules/Colors/Colors.qml | 0 .../ui}/dev-modules/Colors/qmldir | 0 .../ui}/dev-modules/Units/Units.qml | 0 .../ui}/dev-modules/Units/qmldir | 0 .../Common/Animations/BusyIndicator.qml | 0 .../modules/Common/Constants/Constants.qml | 0 .../modules/Common/Dialog/ConfirmDialog.qml | 0 .../Common/Dialog/DialogDescription.qml | 0 .../ui}/modules/Common/Dialog/DialogPlus.qml | 0 .../ui}/modules/Common/Form/ActionBar.qml | 0 .../ui}/modules/Common/Form/ActionButton.qml | 0 .../ui}/modules/Common/Form/ActionSwitch.qml | 0 .../Form/Buttons/AbstractTextButton.qml | 0 .../Common/Form/Buttons/ExclusiveButtons.qml | 0 .../Form/Buttons/ExclusiveButtons.spec.qml | 0 .../Common/Form/Buttons/FileChooserButton.qml | 0 .../Common/Form/Buttons/SmallButton.qml | 0 .../Common/Form/Buttons/TextButtonA.qml | 0 .../Common/Form/Buttons/TextButtonB.qml | 0 .../ui}/modules/Common/Form/CheckBoxText.qml | 0 .../ui}/modules/Common/Form/ComboBox.js | 0 .../ui}/modules/Common/Form/ComboBox.qml | 0 .../Common/Form/CommonItemDelegate.qml | 0 .../modules/Common/Form/DroppableTextArea.qml | 0 .../modules/Common/Form/Fields/HexField.qml | 0 .../Common/Form/Fields/NumericField.qml | 0 .../Common/Form/Fields/PasswordField.qml | 0 .../modules/Common/Form/Fields/PortField.qml | 0 .../Form/Fields/ScrollableListViewField.qml | 0 .../Common/Form/Fields/TextAreaField.qml | 0 .../modules/Common/Form/Fields/TextField.qml | 0 .../ui}/modules/Common/Form/ListForm.js | 0 .../ui}/modules/Common/Form/ListForm.qml | 0 .../modules/Common/Form/ListItemSelector.js | 0 .../modules/Common/Form/ListItemSelector.qml | 0 .../modules/Common/Form/Placements/Form.qml | 0 .../Common/Form/Placements/FormEmptyLine.qml | 0 .../Common/Form/Placements/FormGroup.qml | 0 .../Common/Form/Placements/FormHGroup.qml | 0 .../Common/Form/Placements/FormLine.qml | 0 .../Common/Form/Placements/FormTable.qml | 0 .../Common/Form/Placements/FormTableEntry.qml | 0 .../Common/Form/Placements/FormTableLine.qml | 0 .../Common/Form/Placements/FormVGroup.qml | 0 .../ui}/modules/Common/Form/SearchBox.qml | 0 .../ui}/modules/Common/Form/Slider.qml | 0 .../modules/Common/Form/StaticListForm.qml | 0 .../ui}/modules/Common/Form/Switch.qml | 0 .../ui}/modules/Common/Form/Tab/TabBar.qml | 0 .../ui}/modules/Common/Form/Tab/TabButton.qml | 0 .../modules/Common/Form/Tab/TabContainer.qml | 0 .../Common/Form/TransparentTextInput.qml | 0 .../ui}/modules/Common/Helpers/DragBox.qml | 0 .../Common/Helpers/InvertedMouseArea.qml | 0 .../Common/Helpers/InvertedMouseArea.spec.qml | 0 .../ui}/modules/Common/Image/Icon.qml | 0 .../ui}/modules/Common/Image/RoundedImage.qml | 0 .../ui}/modules/Common/Indicators/VuMeter.qml | 0 .../modules/Common/Menus/ApplicationMenu.qml | 0 .../Common/Menus/ApplicationMenuEntry.qml | 0 .../Common/Menus/DropDownDynamicMenu.qml | 0 .../Common/Menus/DropDownStaticMenu.qml | 0 .../Common/Menus/DropDownStaticMenuEntry.qml | 0 .../ui}/modules/Common/Menus/Menu.qml | 0 .../ui}/modules/Common/Menus/MenuItem.qml | 0 .../ui}/modules/Common/Misc/Borders.qml | 0 .../modules/Common/Misc/ForceScrollBar.qml | 0 .../ui}/modules/Common/Misc/Paned.qml | 0 .../ui}/modules/Common/Popup/DesktopPopup.qml | 0 .../ui}/modules/Common/Popup/Popup.qml | 0 .../ui}/modules/Common/Popup/PopupShadow.qml | 0 .../Styles/Animations/BusyIndicatorStyle.qml | 0 .../Common/Styles/Dialog/DialogStyle.qml | 0 .../Common/Styles/Form/ActionBarStyle.qml | 0 .../Form/Buttons/AbstractTextButtonStyle.qml | 0 .../Form/Buttons/ExclusiveButtonsStyle.qml | 0 .../Form/Buttons/FileChooserButtonStyle.qml | 0 .../Styles/Form/Buttons/SmallButtonStyle.qml | 0 .../Styles/Form/Buttons/TextButtonAStyle.qml | 0 .../Styles/Form/Buttons/TextButtonBStyle.qml | 0 .../Common/Styles/Form/CheckBoxTextStyle.qml | 0 .../Common/Styles/Form/ComboBoxStyle.qml | 0 .../Styles/Form/CommonItemDelegateStyle.qml | 0 .../Styles/Form/DroppableTextAreaStyle.qml | 0 .../Styles/Form/Fields/NumericFieldStyle.qml | 0 .../Styles/Form/Fields/TextAreaFieldStyle.qml | 0 .../Styles/Form/Fields/TextFieldStyle.qml | 0 .../Common/Styles/Form/ListFormStyle.qml | 0 .../Form/Placements/FormHGroupStyle.qml | 0 .../Styles/Form/Placements/FormLineStyle.qml | 0 .../Styles/Form/Placements/FormStyle.qml | 0 .../Form/Placements/FormTableLineStyle.qml | 0 .../Styles/Form/Placements/FormTableStyle.qml | 0 .../Form/Placements/FormVGroupStyle.qml | 0 .../Common/Styles/Form/SearchBoxStyle.qml | 0 .../Common/Styles/Form/SliderStyle.qml | 0 .../Common/Styles/Form/SwitchStyle.qml | 0 .../Common/Styles/Form/Tab/TabButtonStyle.qml | 0 .../Styles/Form/Tab/TabContainerStyle.qml | 0 .../Styles/Form/TransparentTextInputStyle.qml | 0 .../Common/Styles/Indicators/VuMeterStyle.qml | 0 .../Styles/Menus/ApplicationMenuStyle.qml | 0 .../Styles/Menus/DropDownStaticMenuStyle.qml | 0 .../Common/Styles/Menus/MenuItemStyle.qml | 0 .../modules/Common/Styles/Menus/MenuStyle.qml | 0 .../Styles/Misc/ForceScrollBarStyle.qml | 0 .../modules/Common/Styles/Misc/PanedStyle.qml | 0 .../Common/Styles/Popup/PopupStyle.qml | 0 .../Common/Styles/Tooltip/TooltipStyle.qml | 0 .../Common/Styles/Window/WindowStyle.qml | 0 .../ui}/modules/Common/Styles/qmldir | 0 .../ui}/modules/Common/Tooltip/Tooltip.qml | 0 .../modules/Common/Tooltip/TooltipArea.qml | 0 .../Common/View/ScrollableListView.qml | 0 .../Common/Window/ApplicationWindow.qml | 0 .../modules/Common/Window/VirtualWindow.qml | 0 .../ui}/modules/Common/Window/Window.js | 0 .../ui}/modules/Common/Window/Window.qml | 0 .../ui}/modules/Common/qmldir | 0 .../ui}/modules/Konami/Konami.qml | 0 .../ui}/modules/Konami/qmldir | 0 .../Linphone/Account/AccountStatus.qml | 0 .../ui}/modules/Linphone/Blocks/CardBlock.qml | 0 .../modules/Linphone/Blocks/RequestBlock.qml | 0 .../modules/Linphone/Calls/CallControls.qml | 0 .../modules/Linphone/Calls/CallStatistics.qml | 0 .../ui}/modules/Linphone/Calls/Calls.js | 0 .../ui}/modules/Linphone/Calls/Calls.qml | 0 .../Linphone/Calls/ConferenceControls.qml | 0 .../ui}/modules/Linphone/Chat/Chat.js | 0 .../ui}/modules/Linphone/Chat/Chat.qml | 0 .../ui}/modules/Linphone/Chat/Event.qml | 0 .../ui}/modules/Linphone/Chat/FileMessage.qml | 0 .../modules/Linphone/Chat/IncomingMessage.qml | 0 .../ui}/modules/Linphone/Chat/Message.js | 0 .../ui}/modules/Linphone/Chat/Message.qml | 0 .../modules/Linphone/Chat/OutgoingMessage.qml | 0 .../Linphone/Codecs/CodecAttribute.qml | 0 .../modules/Linphone/Codecs/CodecLegend.qml | 0 .../modules/Linphone/Codecs/CodecsViewer.qml | 0 .../ui}/modules/Linphone/Contact/Avatar.qml | 0 .../ui}/modules/Linphone/Contact/Contact.qml | 0 .../Linphone/Contact/ContactDescription.qml | 0 .../Contact/ContactMessageCounter.qml | 0 .../Linphone/Dialog/OnlineInstallerDialog.qml | 0 .../Linphone/Menus/SipAddressesMenu.qml | 0 .../modules/Linphone/Misc/MessageCounter.qml | 0 .../Linphone/Notifications/Notification.qml | 0 .../Notifications/Notification.spec.qml | 0 .../Notifications/NotificationBasic.qml | 0 .../NotificationNewVersionAvailable.qml | 0 .../NotificationReceivedCall.qml | 0 .../NotificationReceivedFileMessage.qml | 0 .../NotificationReceivedMessage.qml | 0 .../NotificationRecordingCompleted.qml | 0 .../NotificationSnapshotWasTaken.qml | 0 .../Linphone/Presence/PresenceLevel.qml | 0 .../SmartSearchBar/SmartSearchBar.qml | 0 .../Styles/Account/AccountStatusStyle.qml | 0 .../Linphone/Styles/Blocks/CardBlockStyle.qml | 0 .../Styles/Blocks/RequestBlockStyle.qml | 0 .../Styles/Calls/CallControlsStyle.qml | 0 .../Styles/Calls/CallStatisticsStyle.qml | 0 .../Linphone/Styles/Calls/CallsStyle.qml | 0 .../Styles/Calls/ConferenceControlsStyle.qml | 0 .../Linphone/Styles/Chat/ChatStyle.qml | 0 .../Styles/Codecs/CodecsViewerStyle.qml | 0 .../Linphone/Styles/Contact/AvatarStyle.qml | 0 .../Contact/ContactDescriptionStyle.qml | 0 .../Contact/ContactMessageCounterStyle.qml | 0 .../Linphone/Styles/Contact/ContactStyle.qml | 0 .../Dialog/OnlineInstallerDialogStyle.qml | 0 .../Styles/Menus/SipAddressesMenuStyle.qml | 0 .../Styles/Misc/MessageCounterStyle.qml | 0 .../Notifications/NotificationBasicStyle.qml | 0 .../NotificationReceivedCallStyle.qml | 0 .../NotificationReceivedFileMessageStyle.qml | 0 .../NotificationReceivedMessageStyle.qml | 0 .../Notifications/NotificationStyle.qml | 0 .../Styles/TelKeypad/TelKeypadStyle.qml | 0 .../Styles/Timeline/TimelineStyle.qml | 0 .../Styles/View/SipAddressesViewStyle.qml | 0 .../ui}/modules/Linphone/Styles/qmldir | 0 .../modules/Linphone/TelKeypad/TelKeypad.js | 0 .../modules/Linphone/TelKeypad/TelKeypad.qml | 0 .../Linphone/TelKeypad/TelKeypadButton.qml | 0 .../ui}/modules/Linphone/Timeline/Timeline.js | 0 .../modules/Linphone/Timeline/Timeline.qml | 0 .../Linphone/View/SipAddressesView.qml | 0 .../ui}/modules/Linphone/qmldir | 0 .../scripts/LinphoneUtils/linphone-utils.js | 0 .../ui}/scripts/LinphoneUtils/qmldir | 0 .../ui}/scripts/Utils/port-tools.js | 0 .../ui}/scripts/Utils/qmldir | 0 .../ui}/scripts/Utils/uri-tools.js | 0 .../ui}/scripts/Utils/uri-tools.spec.qml | 0 .../ui}/scripts/Utils/utils.js | 0 .../ui}/scripts/Utils/utils.spec.qml | 0 .../views/App/Calls/AbstractStartingCall.qml | 0 .../ui}/views/App/Calls/CallsWindow.js | 0 .../ui}/views/App/Calls/CallsWindow.qml | 0 .../ui}/views/App/Calls/Conference.qml | 0 .../App/Calls/Dialogs/CallSipAddress.qml | 0 .../views/App/Calls/Dialogs/CallTransfer.qml | 0 .../App/Calls/Dialogs/ConferenceManager.qml | 0 .../Calls/Dialogs/MultimediaParameters.qml | 0 .../ui}/views/App/Calls/EndedCall.qml | 0 .../ui}/views/App/Calls/Incall.js | 0 .../ui}/views/App/Calls/Incall.qml | 0 .../ui}/views/App/Calls/IncallAvatar.qml | 0 .../App/Calls/IncallFullscreenWindow.qml | 0 .../ui}/views/App/Calls/IncomingCall.qml | 0 .../ui}/views/App/Calls/OutgoingCall.qml | 0 .../App/Calls/ZrtpTokenAuthentication.qml | 0 .../ui}/views/App/Main/Assistant.qml | 0 .../ActivateAppSipAccountWithEmail.qml | 0 .../ActivateAppSipAccountWithPhoneNumber.qml | 0 .../Main/Assistant/AssistantAbstractView.qml | 0 .../App/Main/Assistant/AssistantHome.qml | 0 .../Main/Assistant/CreateAppSipAccount.qml | 0 .../CreateAppSipAccountWithEmail.qml | 0 .../CreateAppSipAccountWithPhoneNumber.qml | 0 .../Assistant/FetchRemoteConfiguration.qml | 0 .../App/Main/Assistant/UseAppSipAccount.qml | 0 .../UseAppSipAccountWithPhoneNumber.qml | 0 .../UseAppSipAccountWithUsername.qml | 0 .../App/Main/Assistant/UseOtherSipAccount.qml | 0 .../ui}/views/App/Main/ContactEdit.js | 0 .../ui}/views/App/Main/ContactEdit.qml | 0 .../ui}/views/App/Main/Contacts.qml | 0 .../ui}/views/App/Main/Conversation.js | 0 .../ui}/views/App/Main/Conversation.qml | 0 .../ui}/views/App/Main/Dialogs/About.qml | 0 .../App/Main/Dialogs/AuthenticationRequest.js | 0 .../Main/Dialogs/AuthenticationRequest.qml | 0 .../views/App/Main/Dialogs/ManageAccount.js | 0 .../views/App/Main/Dialogs/ManageAccounts.qml | 0 .../ui}/views/App/Main/Home.qml | 0 .../ui}/views/App/Main/InviteFriends.qml | 0 .../ui}/views/App/Main/MainWindow.js | 0 .../ui}/views/App/Main/MainWindow.qml | 0 .../ui}/views/App/Main/MainWindowMenuBar.qml | 0 .../views/App/Main/MainWindowTopMenuBar.qml | 0 .../Dialogs/SettingsSipAccountsEdit.js | 0 .../Dialogs/SettingsSipAccountsEdit.qml | 0 .../Settings/Dialogs/SettingsVideoPreview.qml | 0 .../views/App/Settings/SettingsAdvanced.js | 0 .../views/App/Settings/SettingsAdvanced.qml | 0 .../ui}/views/App/Settings/SettingsAudio.qml | 0 .../views/App/Settings/SettingsCallsChat.qml | 0 .../views/App/Settings/SettingsNetwork.qml | 0 .../views/App/Settings/SettingsSipAccounts.js | 0 .../App/Settings/SettingsSipAccounts.qml | 0 .../ui}/views/App/Settings/SettingsUi.js | 0 .../ui}/views/App/Settings/SettingsUi.qml | 0 .../ui}/views/App/Settings/SettingsVideo.js | 0 .../ui}/views/App/Settings/SettingsVideo.qml | 0 .../ui}/views/App/Settings/SettingsWindow.qml | 0 .../ui}/views/App/Styles/Calls/CallStyle.qml | 0 .../App/Styles/Calls/CallsWindowStyle.qml | 0 .../App/Styles/Calls/ConferenceStyle.qml | 0 .../Calls/Dialogs/CallSipAddressStyle.qml | 0 .../Calls/Dialogs/CallTransferStyle.qml | 0 .../Calls/Dialogs/ConferenceManagerStyle.qml | 0 .../Dialogs/MultimediaParametersStyle.qml | 0 .../ActivateAppSipAccountWithEmailStyle.qml | 0 ...ivateAppSipAccountWithPhoneNumberStyle.qml | 0 .../Assistant/AssistantAbstractViewStyle.qml | 0 .../Main/Assistant/AssistantHomeStyle.qml | 0 .../Assistant/CreateAppSipAccountStyle.qml | 0 .../Main/Assistant/UseAppSipAccountStyle.qml | 0 .../views/App/Styles/Main/AssistantStyle.qml | 0 .../App/Styles/Main/ContactEditStyle.qml | 0 .../views/App/Styles/Main/ContactsStyle.qml | 0 .../App/Styles/Main/ConversationStyle.qml | 0 .../App/Styles/Main/Dialogs/AboutStyle.qml | 0 .../Dialogs/AuthenticationRequestStyle.qml | 0 .../Main/Dialogs/ManageAccountsStyle.qml | 0 .../ui}/views/App/Styles/Main/HomeStyle.qml | 0 .../App/Styles/Main/InviteFriendsStyle.qml | 0 .../views/App/Styles/Main/MainWindowStyle.qml | 0 .../Dialogs/SettingsSipAccountsEditStyle.qml | 0 .../Dialogs/SettingsVideoPreviewStyle.qml | 0 .../Styles/Settings/SettingsAdvancedStyle.qml | 0 .../Styles/Settings/SettingsAudioStyle.qml | 0 .../Styles/Settings/SettingsWindowStyle.qml | 0 .../ui}/views/App/Styles/qmldir | 0 prepare.py | 271 ------------------ 729 files changed, 404 deletions(-) delete mode 100755 build_all_linux.sh delete mode 100755 build_all_macos.sh delete mode 100644 build_all_win.bat rename application_info.cmake => linphone-desktop/application_info.cmake (100%) rename {assets => linphone-desktop/assets}/app-icon.rc (100%) rename {assets => linphone-desktop/assets}/assistant/create-app-sip-account.rc (100%) rename {assets => linphone-desktop/assets}/assistant/use-app-sip-account.rc (100%) rename {assets => linphone-desktop/assets}/assistant/use-other-sip-account.rc (100%) rename {assets => linphone-desktop/assets}/fonts/NotoSans-hinted/LICENSE_OFL.txt (100%) rename {assets => linphone-desktop/assets}/fonts/NotoSans-hinted/NotoSans-Bold.ttf (100%) rename {assets => linphone-desktop/assets}/fonts/NotoSans-hinted/NotoSans-BoldItalic.ttf (100%) rename {assets => linphone-desktop/assets}/fonts/NotoSans-hinted/NotoSans-Italic.ttf (100%) rename {assets => linphone-desktop/assets}/fonts/NotoSans-hinted/NotoSans-Regular.ttf (100%) rename {assets => linphone-desktop/assets}/fonts/NotoSans-hinted/NotoSansUI-Bold.ttf (100%) rename {assets => linphone-desktop/assets}/fonts/NotoSans-hinted/NotoSansUI-BoldItalic.ttf (100%) rename {assets => linphone-desktop/assets}/fonts/NotoSans-hinted/NotoSansUI-Italic.ttf (100%) rename {assets => linphone-desktop/assets}/fonts/NotoSans-hinted/NotoSansUI-Regular.ttf (100%) rename {assets => linphone-desktop/assets}/fonts/NotoSans-hinted/README (100%) rename {assets => linphone-desktop/assets}/icon.ico (100%) rename {assets => linphone-desktop/assets}/icons/genicons.sh (100%) rename {assets => linphone-desktop/assets}/icons/genicons_1.0.sh (100%) rename {assets => linphone-desktop/assets}/icons/hicolor/128x128/apps/icon.png (100%) rename {assets => linphone-desktop/assets}/icons/hicolor/16x16/apps/icon.png (100%) rename {assets => linphone-desktop/assets}/icons/hicolor/22x22/apps/icon.png (100%) rename {assets => linphone-desktop/assets}/icons/hicolor/24x24/apps/icon.png (100%) rename {assets => linphone-desktop/assets}/icons/hicolor/256x256/apps/icon.png (100%) rename {assets => linphone-desktop/assets}/icons/hicolor/32x32/apps/icon.png (100%) rename {assets => linphone-desktop/assets}/icons/hicolor/64x64/apps/icon.png (100%) rename {assets => linphone-desktop/assets}/images/add_disabled.svg (100%) rename {assets => linphone-desktop/assets}/images/add_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/add_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/add_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/attachment_disabled.svg (100%) rename {assets => linphone-desktop/assets}/images/attachment_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/attachment_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/attachment_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/auto_answer.svg (100%) rename {assets => linphone-desktop/assets}/images/burger_menu_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/burger_menu_light_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/burger_menu_light_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/burger_menu_light_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/burger_menu_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/burger_menu_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/call_accept_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/call_accept_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/call_accept_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/call_chat_secure_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/call_chat_secure_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/call_chat_secure_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/call_chat_unsecure_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/call_chat_unsecure_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/call_chat_unsecure_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/call_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/call_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/call_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/call_quality_0.svg (100%) rename {assets => linphone-desktop/assets}/images/call_quality_1.svg (100%) rename {assets => linphone-desktop/assets}/images/call_quality_2.svg (100%) rename {assets => linphone-desktop/assets}/images/call_quality_3.svg (100%) rename {assets => linphone-desktop/assets}/images/call_sign_connected.svg (100%) rename {assets => linphone-desktop/assets}/images/call_sign_ended.svg (100%) rename {assets => linphone-desktop/assets}/images/call_sign_incoming.svg (100%) rename {assets => linphone-desktop/assets}/images/call_sign_outgoing.svg (100%) rename {assets => linphone-desktop/assets}/images/call_sign_paused.svg (100%) rename {assets => linphone-desktop/assets}/images/camera.svg (100%) rename {assets => linphone-desktop/assets}/images/camera_off_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/camera_off_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/camera_off_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/camera_off_updating.svg (100%) rename {assets => linphone-desktop/assets}/images/camera_on_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/camera_on_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/camera_on_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/camera_on_updating.svg (100%) rename {assets => linphone-desktop/assets}/images/cancel_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/cancel_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/cancel_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/chat_amount.svg (100%) rename {assets => linphone-desktop/assets}/images/chat_count.svg (100%) rename {assets => linphone-desktop/assets}/images/chat_delivered.svg (100%) rename {assets => linphone-desktop/assets}/images/chat_error.svg (100%) rename {assets => linphone-desktop/assets}/images/chat_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/chat_is_composing_0.svg (100%) rename {assets => linphone-desktop/assets}/images/chat_is_composing_1.svg (100%) rename {assets => linphone-desktop/assets}/images/chat_is_composing_2.svg (100%) rename {assets => linphone-desktop/assets}/images/chat_is_composing_3.svg (100%) rename {assets => linphone-desktop/assets}/images/chat_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/chat_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/chat_read.svg (100%) rename {assets => linphone-desktop/assets}/images/collapse.svg (100%) rename {assets => linphone-desktop/assets}/images/contact_add.svg (100%) rename {assets => linphone-desktop/assets}/images/contact_add_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/contact_add_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/contact_add_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/contact_card_photo_disabled.svg (100%) rename {assets => linphone-desktop/assets}/images/contact_card_photo_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/contact_card_photo_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/contact_card_photo_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/contact_edit_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/contact_edit_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/contact_edit_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/contact_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/contact_selected.svg (100%) rename {assets => linphone-desktop/assets}/images/declined_incoming_call.svg (100%) rename {assets => linphone-desktop/assets}/images/declined_outgoing_call.svg (100%) rename {assets => linphone-desktop/assets}/images/delete_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/delete_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/delete_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/download.svg (100%) rename {assets => linphone-desktop/assets}/images/drop_down.svg (100%) rename {assets => linphone-desktop/assets}/images/edit_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/edit_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/edit_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/ended_call.svg (100%) rename {assets => linphone-desktop/assets}/images/file_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/file_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/file_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/file_sign.svg (100%) rename {assets => linphone-desktop/assets}/images/filter.svg (100%) rename {assets => linphone-desktop/assets}/images/folder_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/folder_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/folder_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/fullscreen_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/fullscreen_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/fullscreen_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/generic_error.svg (100%) rename {assets => linphone-desktop/assets}/images/generic_error_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/generic_error_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/generic_error_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/hangup_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/hangup_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/hangup_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/history.svg (100%) rename {assets => linphone-desktop/assets}/images/history_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/history_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/history_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/home_account_assistant.svg (100%) rename {assets => linphone-desktop/assets}/images/home_invite_friends.svg (100%) rename {assets => linphone-desktop/assets}/images/home_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/home_selected.svg (100%) rename {assets => linphone-desktop/assets}/images/home_use_linphone.svg (100%) rename {assets => linphone-desktop/assets}/images/incoming_call.svg (100%) rename {assets => linphone-desktop/assets}/images/led_green.svg (100%) rename {assets => linphone-desktop/assets}/images/led_orange.svg (100%) rename {assets => linphone-desktop/assets}/images/led_red.svg (100%) rename {assets => linphone-desktop/assets}/images/led_white.svg (100%) rename {assets => linphone-desktop/assets}/images/linphone_logo.svg (100%) rename {assets => linphone-desktop/assets}/images/message_sign.svg (100%) rename {assets => linphone-desktop/assets}/images/micro.svg (100%) rename {assets => linphone-desktop/assets}/images/micro_off_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/micro_off_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/micro_off_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/micro_on_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/micro_on_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/micro_on_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/missed_incoming_call.svg (100%) rename {assets => linphone-desktop/assets}/images/missed_outgoing_call.svg (100%) rename {assets => linphone-desktop/assets}/images/new_call_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/new_call_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/new_call_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/new_conference_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/new_conference_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/new_conference_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/options_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/options_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/options_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/outgoing_call.svg (100%) rename {assets => linphone-desktop/assets}/images/pause_off_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/pause_off_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/pause_off_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/pause_off_updating.svg (100%) rename {assets => linphone-desktop/assets}/images/pause_on_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/pause_on_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/pause_on_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/pause_on_updating.svg (100%) rename {assets => linphone-desktop/assets}/images/record_off.svg (100%) rename {assets => linphone-desktop/assets}/images/record_on.svg (100%) rename {assets => linphone-desktop/assets}/images/recording_sign.svg (100%) rename {assets => linphone-desktop/assets}/images/screenshot_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/screenshot_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/screenshot_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/search.svg (100%) rename {assets => linphone-desktop/assets}/images/settings_advanced_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/settings_advanced_selected.svg (100%) rename {assets => linphone-desktop/assets}/images/settings_audio_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/settings_audio_selected.svg (100%) rename {assets => linphone-desktop/assets}/images/settings_call_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/settings_call_selected.svg (100%) rename {assets => linphone-desktop/assets}/images/settings_network_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/settings_network_selected.svg (100%) rename {assets => linphone-desktop/assets}/images/settings_sip_accounts_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/settings_sip_accounts_selected.svg (100%) rename {assets => linphone-desktop/assets}/images/settings_video_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/settings_video_selected.svg (100%) rename {assets => linphone-desktop/assets}/images/snapshot_sign.svg (100%) rename {assets => linphone-desktop/assets}/images/speaker.svg (100%) rename {assets => linphone-desktop/assets}/images/speaker_off_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/speaker_off_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/speaker_off_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/speaker_on_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/speaker_on_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/speaker_on_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/tel_keypad_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/tel_keypad_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/tel_keypad_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/timeline_history.svg (100%) rename {assets => linphone-desktop/assets}/images/tooltip_arrow_bottom.svg (100%) rename {assets => linphone-desktop/assets}/images/tooltip_arrow_left.svg (100%) rename {assets => linphone-desktop/assets}/images/tooltip_arrow_right.svg (100%) rename {assets => linphone-desktop/assets}/images/tooltip_arrow_top.svg (100%) rename {assets => linphone-desktop/assets}/images/transfer_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/transfer_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/transfer_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/update_sign.svg (100%) rename {assets => linphone-desktop/assets}/images/video_call_accept_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/video_call_accept_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/video_call_accept_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/video_call_hovered.svg (100%) rename {assets => linphone-desktop/assets}/images/video_call_normal.svg (100%) rename {assets => linphone-desktop/assets}/images/video_call_pressed.svg (100%) rename {assets => linphone-desktop/assets}/images/warning.svg (100%) rename {assets => linphone-desktop/assets}/languages/CMakeLists.txt (100%) rename {assets => linphone-desktop/assets}/languages/ar.ts (100%) rename {assets => linphone-desktop/assets}/languages/az.ts (100%) rename {assets => linphone-desktop/assets}/languages/az@latin.ts (100%) rename {assets => linphone-desktop/assets}/languages/cs.ts (100%) rename {assets => linphone-desktop/assets}/languages/de.ts (100%) rename {assets => linphone-desktop/assets}/languages/de_DE.ts (100%) rename {assets => linphone-desktop/assets}/languages/el.ts (100%) rename {assets => linphone-desktop/assets}/languages/en.ts (100%) rename {assets => linphone-desktop/assets}/languages/es.ts (100%) rename {assets => linphone-desktop/assets}/languages/es_AR.ts (100%) rename {assets => linphone-desktop/assets}/languages/fi.ts (100%) rename {assets => linphone-desktop/assets}/languages/fr_FR.ts (100%) rename {assets => linphone-desktop/assets}/languages/he.ts (100%) rename {assets => linphone-desktop/assets}/languages/hu.ts (100%) rename {assets => linphone-desktop/assets}/languages/it.ts (100%) rename {assets => linphone-desktop/assets}/languages/ja.ts (100%) rename {assets => linphone-desktop/assets}/languages/ka.ts (100%) rename {assets => linphone-desktop/assets}/languages/ko_KR.ts (100%) rename {assets => linphone-desktop/assets}/languages/lt.ts (100%) rename {assets => linphone-desktop/assets}/languages/mk_MK.ts (100%) rename {assets => linphone-desktop/assets}/languages/nb_NO.ts (100%) rename {assets => linphone-desktop/assets}/languages/nl.ts (100%) rename {assets => linphone-desktop/assets}/languages/pl.ts (100%) rename {assets => linphone-desktop/assets}/languages/pl_PL.ts (100%) rename {assets => linphone-desktop/assets}/languages/pt_BR.ts (100%) rename {assets => linphone-desktop/assets}/languages/ru.ts (100%) rename {assets => linphone-desktop/assets}/languages/ru_RU.ts (100%) rename {assets => linphone-desktop/assets}/languages/sr.ts (100%) rename {assets => linphone-desktop/assets}/languages/sv.ts (100%) rename {assets => linphone-desktop/assets}/languages/tr.ts (100%) rename {assets => linphone-desktop/assets}/languages/uk.ts (100%) rename {assets => linphone-desktop/assets}/languages/zh-Hant.ts (100%) rename {assets => linphone-desktop/assets}/languages/zh.ts (100%) rename {assets => linphone-desktop/assets}/languages/zh_CN.GB2312.ts (100%) rename {assets => linphone-desktop/assets}/languages/zh_CN.ts (100%) rename {assets => linphone-desktop/assets}/languages/zh_TW.ts (100%) rename {assets => linphone-desktop/assets}/linphone.desktop.cmake (100%) rename {assets => linphone-desktop/assets}/linphonerc-factory (100%) rename {build => linphone-desktop/build}/CMakeLists.txt (100%) rename {build => linphone-desktop/build}/rpm/linphone.spec.cmake (100%) rename {build => linphone-desktop/build}/rpm/qt5.spec (100%) rename {cmake => linphone-desktop/cmake}/FindMinizip.cmake (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/CMakeLists.txt (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/additional_steps.cmake (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/install.cmake (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/CMakeLists.txt (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/macos/Info.plist.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/macos/background_dmg.jpg (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/macos/linphone.icns (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/macos/linphone_dmg.scpt.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/macos/packaging.cmake.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/sdk_content/antlr3c.list.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/sdk_content/bctoolbox.list.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/sdk_content/bcunit.list.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/sdk_content/bellesip.list.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/sdk_content/bv16.list.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/sdk_content/bzrtp.list.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/sdk_content/ffmpeg.list.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/sdk_content/gsm.list.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/sdk_content/linphone.list.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/sdk_content/linphonecxx.list.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/sdk_content/mbedtls.list.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/sdk_content/ms2.list.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/sdk_content/ms2plugins.list.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/sdk_content/opus.list.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/sdk_content/ortp.list.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/sdk_content/polarssl.list.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/sdk_content/speex.list.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/sdk_content/sqlite3.list.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/sdk_content/srtp.list.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/sdk_content/vcard.list.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/sdk_content/xml2.list.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/sdk_content/zlib.list.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/windows/NSIS.template.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/windows/install.nsi.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/windows/nsis_banner.bmp (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/windows/packaging.cmake.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/windows/signtool.py (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/windows/uninstall.nsi.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphone_package/windows/winshortcut.vbs.in (100%) rename {cmake_builder => linphone-desktop/cmake_builder}/linphoneqt.cmake (100%) rename resources.qrc => linphone-desktop/resources.qrc (100%) rename {src => linphone-desktop/src}/app/App.cpp (100%) rename {src => linphone-desktop/src}/app/App.hpp (100%) rename {src => linphone-desktop/src}/app/AppController.cpp (100%) rename {src => linphone-desktop/src}/app/AppController.hpp (100%) rename {src => linphone-desktop/src}/app/cli/Cli.cpp (100%) rename {src => linphone-desktop/src}/app/cli/Cli.hpp (100%) rename {src => linphone-desktop/src}/app/logger/Logger.cpp (100%) rename {src => linphone-desktop/src}/app/logger/Logger.hpp (100%) rename {src => linphone-desktop/src}/app/main.cpp (100%) rename {src => linphone-desktop/src}/app/paths/Paths.cpp (100%) rename {src => linphone-desktop/src}/app/paths/Paths.hpp (100%) rename {src => linphone-desktop/src}/app/providers/AvatarProvider.cpp (100%) rename {src => linphone-desktop/src}/app/providers/AvatarProvider.hpp (100%) rename {src => linphone-desktop/src}/app/providers/ImageProvider.cpp (100%) rename {src => linphone-desktop/src}/app/providers/ImageProvider.hpp (100%) rename {src => linphone-desktop/src}/app/providers/ThumbnailProvider.cpp (100%) rename {src => linphone-desktop/src}/app/providers/ThumbnailProvider.hpp (100%) rename {src => linphone-desktop/src}/app/single-application/SingleApplication.cpp (100%) rename {src => linphone-desktop/src}/app/single-application/SingleApplication.hpp (100%) rename {src => linphone-desktop/src}/app/single-application/SingleApplicationDBus.cpp (100%) rename {src => linphone-desktop/src}/app/single-application/SingleApplicationDBusPrivate.hpp (100%) rename {src => linphone-desktop/src}/app/single-application/SingleApplicationPrivate.hpp (100%) rename {src => linphone-desktop/src}/app/translator/DefaultTranslator.cpp (100%) rename {src => linphone-desktop/src}/app/translator/DefaultTranslator.hpp (100%) rename {src => linphone-desktop/src}/components/Components.hpp (100%) rename {src => linphone-desktop/src}/components/assistant/AssistantModel.cpp (100%) rename {src => linphone-desktop/src}/components/assistant/AssistantModel.hpp (100%) rename {src => linphone-desktop/src}/components/authentication/AuthenticationNotifier.cpp (100%) rename {src => linphone-desktop/src}/components/authentication/AuthenticationNotifier.hpp (100%) rename {src => linphone-desktop/src}/components/call/CallModel.cpp (100%) rename {src => linphone-desktop/src}/components/call/CallModel.hpp (100%) rename {src => linphone-desktop/src}/components/calls/CallsListModel.cpp (100%) rename {src => linphone-desktop/src}/components/calls/CallsListModel.hpp (100%) rename {src => linphone-desktop/src}/components/calls/CallsListProxyModel.cpp (100%) rename {src => linphone-desktop/src}/components/calls/CallsListProxyModel.hpp (100%) rename {src => linphone-desktop/src}/components/camera/Camera.cpp (100%) rename {src => linphone-desktop/src}/components/camera/Camera.hpp (100%) rename {src => linphone-desktop/src}/components/camera/CameraPreview.cpp (100%) rename {src => linphone-desktop/src}/components/camera/CameraPreview.hpp (100%) rename {src => linphone-desktop/src}/components/camera/MSFunctions.cpp (100%) rename {src => linphone-desktop/src}/components/camera/MSFunctions.hpp (100%) rename {src => linphone-desktop/src}/components/chat/ChatModel.cpp (100%) rename {src => linphone-desktop/src}/components/chat/ChatModel.hpp (100%) rename {src => linphone-desktop/src}/components/chat/ChatProxyModel.cpp (100%) rename {src => linphone-desktop/src}/components/chat/ChatProxyModel.hpp (100%) rename {src => linphone-desktop/src}/components/codecs/AbstractCodecsModel.cpp (100%) rename {src => linphone-desktop/src}/components/codecs/AbstractCodecsModel.hpp (100%) rename {src => linphone-desktop/src}/components/codecs/AudioCodecsModel.cpp (100%) rename {src => linphone-desktop/src}/components/codecs/AudioCodecsModel.hpp (100%) rename {src => linphone-desktop/src}/components/codecs/VideoCodecsModel.cpp (100%) rename {src => linphone-desktop/src}/components/codecs/VideoCodecsModel.hpp (100%) rename {src => linphone-desktop/src}/components/conference/ConferenceAddModel.cpp (100%) rename {src => linphone-desktop/src}/components/conference/ConferenceAddModel.hpp (100%) rename {src => linphone-desktop/src}/components/conference/ConferenceHelperModel.cpp (100%) rename {src => linphone-desktop/src}/components/conference/ConferenceHelperModel.hpp (100%) rename {src => linphone-desktop/src}/components/conference/ConferenceModel.cpp (100%) rename {src => linphone-desktop/src}/components/conference/ConferenceModel.hpp (100%) rename {src => linphone-desktop/src}/components/contact/ContactModel.cpp (100%) rename {src => linphone-desktop/src}/components/contact/ContactModel.hpp (100%) rename {src => linphone-desktop/src}/components/contact/VcardModel.cpp (100%) rename {src => linphone-desktop/src}/components/contact/VcardModel.hpp (100%) rename {src => linphone-desktop/src}/components/contacts/ContactsListModel.cpp (100%) rename {src => linphone-desktop/src}/components/contacts/ContactsListModel.hpp (100%) rename {src => linphone-desktop/src}/components/contacts/ContactsListProxyModel.cpp (100%) rename {src => linphone-desktop/src}/components/contacts/ContactsListProxyModel.hpp (100%) rename {src => linphone-desktop/src}/components/core/CoreHandlers.cpp (100%) rename {src => linphone-desktop/src}/components/core/CoreHandlers.hpp (100%) rename {src => linphone-desktop/src}/components/core/CoreManager.cpp (100%) rename {src => linphone-desktop/src}/components/core/CoreManager.hpp (100%) rename {src => linphone-desktop/src}/components/core/event-count-notifier/AbstractEventCountNotifier.cpp (100%) rename {src => linphone-desktop/src}/components/core/event-count-notifier/AbstractEventCountNotifier.hpp (100%) rename {src => linphone-desktop/src}/components/core/event-count-notifier/EventCountNotifierMacOs.hpp (100%) rename {src => linphone-desktop/src}/components/core/event-count-notifier/EventCountNotifierMacOs.m (100%) rename {src => linphone-desktop/src}/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.cpp (100%) rename {src => linphone-desktop/src}/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.hpp (100%) rename {src => linphone-desktop/src}/components/file/FileDownloader.cpp (100%) rename {src => linphone-desktop/src}/components/file/FileDownloader.hpp (100%) rename {src => linphone-desktop/src}/components/file/FileExtractor.cpp (100%) rename {src => linphone-desktop/src}/components/file/FileExtractor.hpp (100%) rename {src => linphone-desktop/src}/components/notifier/Notifier.cpp (100%) rename {src => linphone-desktop/src}/components/notifier/Notifier.hpp (100%) rename {src => linphone-desktop/src}/components/other/clipboard/Clipboard.cpp (100%) rename {src => linphone-desktop/src}/components/other/clipboard/Clipboard.hpp (100%) rename {src => linphone-desktop/src}/components/other/colors/Colors.cpp (100%) rename {src => linphone-desktop/src}/components/other/colors/Colors.hpp (100%) rename {src => linphone-desktop/src}/components/other/desktop-tools/DesktopTools.hpp (100%) rename {src => linphone-desktop/src}/components/other/desktop-tools/DesktopToolsLinux.cpp (100%) rename {src => linphone-desktop/src}/components/other/desktop-tools/DesktopToolsLinux.hpp (100%) rename {src => linphone-desktop/src}/components/other/desktop-tools/DesktopToolsMacOs.cpp (100%) rename {src => linphone-desktop/src}/components/other/desktop-tools/DesktopToolsMacOs.hpp (100%) rename {src => linphone-desktop/src}/components/other/desktop-tools/DesktopToolsWindows.cpp (100%) rename {src => linphone-desktop/src}/components/other/desktop-tools/DesktopToolsWindows.hpp (100%) rename {src => linphone-desktop/src}/components/other/desktop-tools/screen-saver/ScreenSaverDBus.cpp (100%) rename {src => linphone-desktop/src}/components/other/desktop-tools/screen-saver/ScreenSaverDBus.hpp (100%) rename {src => linphone-desktop/src}/components/other/desktop-tools/screen-saver/ScreenSaverMacOs.m (100%) rename {src => linphone-desktop/src}/components/other/desktop-tools/screen-saver/ScreenSaverXdg.cpp (100%) rename {src => linphone-desktop/src}/components/other/desktop-tools/screen-saver/ScreenSaverXdg.hpp (100%) rename {src => linphone-desktop/src}/components/other/desktop-tools/state-process/StateProcessMacOs.mm (100%) rename {src => linphone-desktop/src}/components/other/text-to-speech/TextToSpeech.cpp (100%) rename {src => linphone-desktop/src}/components/other/text-to-speech/TextToSpeech.hpp (100%) rename {src => linphone-desktop/src}/components/other/units/Units.cpp (100%) rename {src => linphone-desktop/src}/components/other/units/Units.hpp (100%) rename {src => linphone-desktop/src}/components/presence/OwnPresenceModel.cpp (100%) rename {src => linphone-desktop/src}/components/presence/OwnPresenceModel.hpp (100%) rename {src => linphone-desktop/src}/components/presence/Presence.cpp (100%) rename {src => linphone-desktop/src}/components/presence/Presence.hpp (100%) rename {src => linphone-desktop/src}/components/settings/AccountSettingsModel.cpp (100%) rename {src => linphone-desktop/src}/components/settings/AccountSettingsModel.hpp (100%) rename {src => linphone-desktop/src}/components/settings/SettingsModel.cpp (100%) rename {src => linphone-desktop/src}/components/settings/SettingsModel.hpp (100%) rename {src => linphone-desktop/src}/components/sip-addresses/SipAddressObserver.cpp (100%) rename {src => linphone-desktop/src}/components/sip-addresses/SipAddressObserver.hpp (100%) rename {src => linphone-desktop/src}/components/sip-addresses/SipAddressesModel.cpp (100%) rename {src => linphone-desktop/src}/components/sip-addresses/SipAddressesModel.hpp (100%) rename {src => linphone-desktop/src}/components/sip-addresses/SipAddressesProxyModel.cpp (100%) rename {src => linphone-desktop/src}/components/sip-addresses/SipAddressesProxyModel.hpp (100%) rename {src => linphone-desktop/src}/components/sound-player/SoundPlayer.cpp (100%) rename {src => linphone-desktop/src}/components/sound-player/SoundPlayer.hpp (100%) rename {src => linphone-desktop/src}/components/telephone-numbers/TelephoneNumbersModel.cpp (100%) rename {src => linphone-desktop/src}/components/telephone-numbers/TelephoneNumbersModel.hpp (100%) rename {src => linphone-desktop/src}/components/timeline/TimelineModel.cpp (100%) rename {src => linphone-desktop/src}/components/timeline/TimelineModel.hpp (100%) rename {src => linphone-desktop/src}/components/url-handlers/UrlHandlers.cpp (100%) rename {src => linphone-desktop/src}/components/url-handlers/UrlHandlers.hpp (100%) rename {src => linphone-desktop/src}/config.h.cmake (100%) rename {src => linphone-desktop/src}/utils/LinphoneUtils.cpp (100%) rename {src => linphone-desktop/src}/utils/LinphoneUtils.hpp (100%) rename {src => linphone-desktop/src}/utils/MediastreamerUtils.cpp (100%) rename {src => linphone-desktop/src}/utils/MediastreamerUtils.hpp (100%) rename {src => linphone-desktop/src}/utils/QExifImageHeader.cpp (100%) rename {src => linphone-desktop/src}/utils/QExifImageHeader.hpp (100%) rename {src => linphone-desktop/src}/utils/Utils.cpp (100%) rename {src => linphone-desktop/src}/utils/Utils.hpp (100%) rename {tools => linphone-desktop/tools}/build_qt_rpm (100%) rename {tools => linphone-desktop/tools}/check_qml_syntax (100%) rename {tools => linphone-desktop/tools}/private/pre-commit (100%) rename {tools => linphone-desktop/tools}/test_qml (100%) rename {tools => linphone-desktop/tools}/update_resources (100%) rename {ui => linphone-desktop/ui}/dev-modules/Colors/Colors.qml (100%) rename {ui => linphone-desktop/ui}/dev-modules/Colors/qmldir (100%) rename {ui => linphone-desktop/ui}/dev-modules/Units/Units.qml (100%) rename {ui => linphone-desktop/ui}/dev-modules/Units/qmldir (100%) rename {ui => linphone-desktop/ui}/modules/Common/Animations/BusyIndicator.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Constants/Constants.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Dialog/ConfirmDialog.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Dialog/DialogDescription.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Dialog/DialogPlus.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/ActionBar.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/ActionButton.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/ActionSwitch.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Buttons/AbstractTextButton.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Buttons/ExclusiveButtons.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Buttons/ExclusiveButtons.spec.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Buttons/FileChooserButton.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Buttons/SmallButton.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Buttons/TextButtonA.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Buttons/TextButtonB.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/CheckBoxText.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/ComboBox.js (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/ComboBox.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/CommonItemDelegate.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/DroppableTextArea.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Fields/HexField.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Fields/NumericField.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Fields/PasswordField.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Fields/PortField.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Fields/ScrollableListViewField.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Fields/TextAreaField.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Fields/TextField.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/ListForm.js (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/ListForm.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/ListItemSelector.js (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/ListItemSelector.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Placements/Form.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Placements/FormEmptyLine.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Placements/FormGroup.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Placements/FormHGroup.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Placements/FormLine.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Placements/FormTable.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Placements/FormTableEntry.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Placements/FormTableLine.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Placements/FormVGroup.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/SearchBox.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Slider.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/StaticListForm.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Switch.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Tab/TabBar.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Tab/TabButton.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/Tab/TabContainer.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Form/TransparentTextInput.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Helpers/DragBox.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Helpers/InvertedMouseArea.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Helpers/InvertedMouseArea.spec.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Image/Icon.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Image/RoundedImage.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Indicators/VuMeter.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Menus/ApplicationMenu.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Menus/ApplicationMenuEntry.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Menus/DropDownDynamicMenu.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Menus/DropDownStaticMenu.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Menus/DropDownStaticMenuEntry.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Menus/Menu.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Menus/MenuItem.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Misc/Borders.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Misc/ForceScrollBar.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Misc/Paned.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Popup/DesktopPopup.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Popup/Popup.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Popup/PopupShadow.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Animations/BusyIndicatorStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Dialog/DialogStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Form/ActionBarStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Form/Buttons/AbstractTextButtonStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Form/Buttons/FileChooserButtonStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Form/Buttons/TextButtonBStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Form/CheckBoxTextStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Form/ComboBoxStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Form/CommonItemDelegateStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Form/DroppableTextAreaStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Form/Fields/TextAreaFieldStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Form/Fields/TextFieldStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Form/ListFormStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Form/Placements/FormHGroupStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Form/Placements/FormLineStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Form/Placements/FormStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Form/Placements/FormTableLineStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Form/Placements/FormTableStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Form/Placements/FormVGroupStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Form/SearchBoxStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Form/SliderStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Form/SwitchStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Form/Tab/TabButtonStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Form/Tab/TabContainerStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Form/TransparentTextInputStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Indicators/VuMeterStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Menus/ApplicationMenuStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Menus/DropDownStaticMenuStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Menus/MenuItemStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Menus/MenuStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Misc/ForceScrollBarStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Misc/PanedStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Popup/PopupStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Tooltip/TooltipStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/Window/WindowStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Styles/qmldir (100%) rename {ui => linphone-desktop/ui}/modules/Common/Tooltip/Tooltip.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Tooltip/TooltipArea.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/View/ScrollableListView.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Window/ApplicationWindow.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Window/VirtualWindow.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/Window/Window.js (100%) rename {ui => linphone-desktop/ui}/modules/Common/Window/Window.qml (100%) rename {ui => linphone-desktop/ui}/modules/Common/qmldir (100%) rename {ui => linphone-desktop/ui}/modules/Konami/Konami.qml (100%) rename {ui => linphone-desktop/ui}/modules/Konami/qmldir (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Account/AccountStatus.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Blocks/CardBlock.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Blocks/RequestBlock.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Calls/CallControls.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Calls/CallStatistics.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Calls/Calls.js (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Calls/Calls.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Calls/ConferenceControls.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Chat/Chat.js (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Chat/Chat.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Chat/Event.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Chat/FileMessage.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Chat/IncomingMessage.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Chat/Message.js (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Chat/Message.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Chat/OutgoingMessage.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Codecs/CodecAttribute.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Codecs/CodecLegend.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Codecs/CodecsViewer.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Contact/Avatar.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Contact/Contact.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Contact/ContactDescription.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Contact/ContactMessageCounter.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Dialog/OnlineInstallerDialog.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Menus/SipAddressesMenu.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Misc/MessageCounter.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Notifications/Notification.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Notifications/Notification.spec.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Notifications/NotificationBasic.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Notifications/NotificationNewVersionAvailable.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Notifications/NotificationReceivedCall.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Notifications/NotificationReceivedMessage.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Notifications/NotificationRecordingCompleted.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Notifications/NotificationSnapshotWasTaken.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Presence/PresenceLevel.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/SmartSearchBar/SmartSearchBar.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Styles/Account/AccountStatusStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Styles/Blocks/CardBlockStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Styles/Blocks/RequestBlockStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Styles/Calls/CallControlsStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Styles/Calls/CallsStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Styles/Calls/ConferenceControlsStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Styles/Chat/ChatStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Styles/Contact/AvatarStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Styles/Contact/ContactMessageCounterStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Styles/Contact/ContactStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Styles/Menus/SipAddressesMenuStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Styles/Misc/MessageCounterStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Styles/Notifications/NotificationBasicStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Styles/Notifications/NotificationReceivedCallStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Styles/Notifications/NotificationReceivedFileMessageStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Styles/Notifications/NotificationStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Styles/TelKeypad/TelKeypadStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Styles/Timeline/TimelineStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Styles/View/SipAddressesViewStyle.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Styles/qmldir (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/TelKeypad/TelKeypad.js (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/TelKeypad/TelKeypad.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/TelKeypad/TelKeypadButton.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Timeline/Timeline.js (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/Timeline/Timeline.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/View/SipAddressesView.qml (100%) rename {ui => linphone-desktop/ui}/modules/Linphone/qmldir (100%) rename {ui => linphone-desktop/ui}/scripts/LinphoneUtils/linphone-utils.js (100%) rename {ui => linphone-desktop/ui}/scripts/LinphoneUtils/qmldir (100%) rename {ui => linphone-desktop/ui}/scripts/Utils/port-tools.js (100%) rename {ui => linphone-desktop/ui}/scripts/Utils/qmldir (100%) rename {ui => linphone-desktop/ui}/scripts/Utils/uri-tools.js (100%) rename {ui => linphone-desktop/ui}/scripts/Utils/uri-tools.spec.qml (100%) rename {ui => linphone-desktop/ui}/scripts/Utils/utils.js (100%) rename {ui => linphone-desktop/ui}/scripts/Utils/utils.spec.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Calls/AbstractStartingCall.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Calls/CallsWindow.js (100%) rename {ui => linphone-desktop/ui}/views/App/Calls/CallsWindow.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Calls/Conference.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Calls/Dialogs/CallSipAddress.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Calls/Dialogs/CallTransfer.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Calls/Dialogs/ConferenceManager.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Calls/Dialogs/MultimediaParameters.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Calls/EndedCall.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Calls/Incall.js (100%) rename {ui => linphone-desktop/ui}/views/App/Calls/Incall.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Calls/IncallAvatar.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Calls/IncallFullscreenWindow.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Calls/IncomingCall.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Calls/OutgoingCall.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Calls/ZrtpTokenAuthentication.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Main/Assistant.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Main/Assistant/ActivateAppSipAccountWithEmail.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Main/Assistant/ActivateAppSipAccountWithPhoneNumber.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Main/Assistant/AssistantAbstractView.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Main/Assistant/AssistantHome.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Main/Assistant/CreateAppSipAccount.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Main/Assistant/CreateAppSipAccountWithEmail.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Main/Assistant/CreateAppSipAccountWithPhoneNumber.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Main/Assistant/FetchRemoteConfiguration.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Main/Assistant/UseAppSipAccount.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Main/Assistant/UseAppSipAccountWithPhoneNumber.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Main/Assistant/UseAppSipAccountWithUsername.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Main/Assistant/UseOtherSipAccount.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Main/ContactEdit.js (100%) rename {ui => linphone-desktop/ui}/views/App/Main/ContactEdit.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Main/Contacts.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Main/Conversation.js (100%) rename {ui => linphone-desktop/ui}/views/App/Main/Conversation.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Main/Dialogs/About.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Main/Dialogs/AuthenticationRequest.js (100%) rename {ui => linphone-desktop/ui}/views/App/Main/Dialogs/AuthenticationRequest.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Main/Dialogs/ManageAccount.js (100%) rename {ui => linphone-desktop/ui}/views/App/Main/Dialogs/ManageAccounts.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Main/Home.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Main/InviteFriends.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Main/MainWindow.js (100%) rename {ui => linphone-desktop/ui}/views/App/Main/MainWindow.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Main/MainWindowMenuBar.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Main/MainWindowTopMenuBar.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Settings/Dialogs/SettingsSipAccountsEdit.js (100%) rename {ui => linphone-desktop/ui}/views/App/Settings/Dialogs/SettingsSipAccountsEdit.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Settings/Dialogs/SettingsVideoPreview.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Settings/SettingsAdvanced.js (100%) rename {ui => linphone-desktop/ui}/views/App/Settings/SettingsAdvanced.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Settings/SettingsAudio.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Settings/SettingsCallsChat.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Settings/SettingsNetwork.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Settings/SettingsSipAccounts.js (100%) rename {ui => linphone-desktop/ui}/views/App/Settings/SettingsSipAccounts.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Settings/SettingsUi.js (100%) rename {ui => linphone-desktop/ui}/views/App/Settings/SettingsUi.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Settings/SettingsVideo.js (100%) rename {ui => linphone-desktop/ui}/views/App/Settings/SettingsVideo.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Settings/SettingsWindow.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Calls/CallStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Calls/CallsWindowStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Calls/ConferenceStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Calls/Dialogs/CallSipAddressStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Calls/Dialogs/CallTransferStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Calls/Dialogs/ConferenceManagerStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Calls/Dialogs/MultimediaParametersStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithEmailStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithPhoneNumberStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Main/Assistant/CreateAppSipAccountStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Main/Assistant/UseAppSipAccountStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Main/AssistantStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Main/ContactEditStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Main/ContactsStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Main/ConversationStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Main/Dialogs/AboutStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Main/Dialogs/AuthenticationRequestStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Main/HomeStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Main/InviteFriendsStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Main/MainWindowStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Settings/Dialogs/SettingsSipAccountsEditStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Settings/Dialogs/SettingsVideoPreviewStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Settings/SettingsAdvancedStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Settings/SettingsAudioStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/Settings/SettingsWindowStyle.qml (100%) rename {ui => linphone-desktop/ui}/views/App/Styles/qmldir (100%) delete mode 100755 prepare.py diff --git a/build_all_linux.sh b/build_all_linux.sh deleted file mode 100755 index 148e37883..000000000 --- a/build_all_linux.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash -## -## Copyright (c) 2010-2020 Belledonne Communications SARL. -## -## This file is part of linphone-desktop -## (see https://www.linphone.org). -## -## This program is free software: you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation, either version 3 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program. If not, see . -## - -################################################################################ -# Linux First building script -#------------------------------------------------------------------------------- - -#Stop at error -set -e - -if [[ -z ${Qt5_DIR} ]]; then - eval "$(qtchooser -print-env)" - export Qt5_DIR=${QTLIBDIR}/cmake/Qt5 - export PATH=${QTTOOLDIR}:$PATH -fi - -#Creation of folders -rm -rf build-desktop -mkdir -p build-desktop -#Opus crash on Linux. The version for 4.3 is old. We have to use a switch in configuration to select the newest version for desktop. -#SDK building -cd build-desktop -#cmake .. -DLINPHONESDK_PLATFORM=Desktop -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_VPX=YES -DENABLE_GPL_THIRD_PARTIES=YES -DENABLE_NON_FREE_CODECS=YES -DENABLE_AMRNB=YES -DENABLE_AMRWB=YES -DENABLE_G729=YES -DENABLE_GSM=YES -DENABLE_ILBC=YES -DENABLE_ISAC=YES -DENABLE_SILK=YES -DENABLE_SPEEX=YES -DENABLE_H263=YES -DENABLE_H263P=YES -DENABLE_MPEG4=YES -DENABLE_OPENH264=YES -DENABLE_FFMPEG=YES -DENABLE_VIDEO=YES -DENABLE_GL=YES -DENABLE_OPUS=NO -cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_OPUS=NO -cmake --build . --target sdk --config RelWithDebInfo --parallel 10 - -#MiniZip Building -cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -cmake --build . --target minizip --config RelWithDebInfo --parallel 10 -cmake --build . --target install - -#Desktop Building -cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -cmake --build . --target all --config RelWithDebInfo --parallel 10 -cmake --build . --target install - - - diff --git a/build_all_macos.sh b/build_all_macos.sh deleted file mode 100755 index 0bc694d21..000000000 --- a/build_all_macos.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -## -## Copyright (c) 2010-2020 Belledonne Communications SARL. -## -## This file is part of linphone-desktop -## (see https://www.linphone.org). -## -## This program is free software: you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation, either version 3 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program. If not, see . -## -################################################################################ - -#------------------------------------------------------------------------------- -# MAC OSX First building script -#------------------------------------------------------------------------------- -#Stop at error -set -e - -if [[ -z ${Qt5_DIR} ]]; then - export Qt5_DIR=/usr/opt/qt/lib/cmake - export PATH=$PATH:/usr/local/opt/qt/bin -fi - -#Creation of folders -rm -rf build-desktop -mkdir -p build-desktop -cd build-desktop - -#SDK building -#LINPHONESDK_DOXYGEN_PROGRAM is set just to be sure to get the version of the Application folder -cmake .. -DLINPHONESDK_DOXYGEN_PROGRAM=/Applications/Doxygen.app/Contents/Resources/doxygen -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -DCMAKE_BUILD_TYPE=RelWithDebInfo -cmake --build . --target all --config RelWithDebInfo --parallel 10 - -#MiniZip Building -cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -cmake --build . --target all --config RelWithDebInfo --parallel 10 -cmake --build . --target install - -#Desktop Building -cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -cmake --build . --target all --config RelWithDebInfo -cmake --build . --target install - - - diff --git a/build_all_win.bat b/build_all_win.bat deleted file mode 100644 index 7955b3bd3..000000000 --- a/build_all_win.bat +++ /dev/null @@ -1,22 +0,0 @@ - -:: Preparing folders -IF NOT EXIST build-desktop mkdir build-desktop - -:: SDK Building -cd build-desktop -:: Default config -cmake .. -DLINPHONESDK_PLATFORM=Desktop -DCMAKE_BUILD_TYPE=RelWithDebInfo -A Win32 -:: Mini config -::cmake .. -DLINPHONESDK_PLATFORM=Desktop -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_VPX=NO -DENABLE_OPUS=NO -A Win32 -DENABLE_VIDEO=YES -DENABLE_GL=YES -if %errorlevel% neq 0 exit /b %errorlevel% -cmake --build . --target sdk --config RelWithDebInfo --parallel 10 -- /maxcpucount /nodeReuse:true /p:TrackFileAccess=false -if %errorlevel% neq 0 exit /b %errorlevel% - -:: Minizip Submodule Building -cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -A Win32 -cmake --build . --target install --config RelWithDebInfo --parallel 10 -- /maxcpucount /nodeReuse:true /p:TrackFileAccess=false - -:: Desktop Building -cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -A Win32 -if %errorlevel% neq 0 exit /b %errorlevel% -cmake --build . --target install --config RelWithDebInfo --parallel 10 -- /maxcpucount /nodeReuse:true /p:TrackFileAccess=false diff --git a/application_info.cmake b/linphone-desktop/application_info.cmake similarity index 100% rename from application_info.cmake rename to linphone-desktop/application_info.cmake diff --git a/assets/app-icon.rc b/linphone-desktop/assets/app-icon.rc similarity index 100% rename from assets/app-icon.rc rename to linphone-desktop/assets/app-icon.rc diff --git a/assets/assistant/create-app-sip-account.rc b/linphone-desktop/assets/assistant/create-app-sip-account.rc similarity index 100% rename from assets/assistant/create-app-sip-account.rc rename to linphone-desktop/assets/assistant/create-app-sip-account.rc diff --git a/assets/assistant/use-app-sip-account.rc b/linphone-desktop/assets/assistant/use-app-sip-account.rc similarity index 100% rename from assets/assistant/use-app-sip-account.rc rename to linphone-desktop/assets/assistant/use-app-sip-account.rc diff --git a/assets/assistant/use-other-sip-account.rc b/linphone-desktop/assets/assistant/use-other-sip-account.rc similarity index 100% rename from assets/assistant/use-other-sip-account.rc rename to linphone-desktop/assets/assistant/use-other-sip-account.rc diff --git a/assets/fonts/NotoSans-hinted/LICENSE_OFL.txt b/linphone-desktop/assets/fonts/NotoSans-hinted/LICENSE_OFL.txt similarity index 100% rename from assets/fonts/NotoSans-hinted/LICENSE_OFL.txt rename to linphone-desktop/assets/fonts/NotoSans-hinted/LICENSE_OFL.txt diff --git a/assets/fonts/NotoSans-hinted/NotoSans-Bold.ttf b/linphone-desktop/assets/fonts/NotoSans-hinted/NotoSans-Bold.ttf similarity index 100% rename from assets/fonts/NotoSans-hinted/NotoSans-Bold.ttf rename to linphone-desktop/assets/fonts/NotoSans-hinted/NotoSans-Bold.ttf diff --git a/assets/fonts/NotoSans-hinted/NotoSans-BoldItalic.ttf b/linphone-desktop/assets/fonts/NotoSans-hinted/NotoSans-BoldItalic.ttf similarity index 100% rename from assets/fonts/NotoSans-hinted/NotoSans-BoldItalic.ttf rename to linphone-desktop/assets/fonts/NotoSans-hinted/NotoSans-BoldItalic.ttf diff --git a/assets/fonts/NotoSans-hinted/NotoSans-Italic.ttf b/linphone-desktop/assets/fonts/NotoSans-hinted/NotoSans-Italic.ttf similarity index 100% rename from assets/fonts/NotoSans-hinted/NotoSans-Italic.ttf rename to linphone-desktop/assets/fonts/NotoSans-hinted/NotoSans-Italic.ttf diff --git a/assets/fonts/NotoSans-hinted/NotoSans-Regular.ttf b/linphone-desktop/assets/fonts/NotoSans-hinted/NotoSans-Regular.ttf similarity index 100% rename from assets/fonts/NotoSans-hinted/NotoSans-Regular.ttf rename to linphone-desktop/assets/fonts/NotoSans-hinted/NotoSans-Regular.ttf diff --git a/assets/fonts/NotoSans-hinted/NotoSansUI-Bold.ttf b/linphone-desktop/assets/fonts/NotoSans-hinted/NotoSansUI-Bold.ttf similarity index 100% rename from assets/fonts/NotoSans-hinted/NotoSansUI-Bold.ttf rename to linphone-desktop/assets/fonts/NotoSans-hinted/NotoSansUI-Bold.ttf diff --git a/assets/fonts/NotoSans-hinted/NotoSansUI-BoldItalic.ttf b/linphone-desktop/assets/fonts/NotoSans-hinted/NotoSansUI-BoldItalic.ttf similarity index 100% rename from assets/fonts/NotoSans-hinted/NotoSansUI-BoldItalic.ttf rename to linphone-desktop/assets/fonts/NotoSans-hinted/NotoSansUI-BoldItalic.ttf diff --git a/assets/fonts/NotoSans-hinted/NotoSansUI-Italic.ttf b/linphone-desktop/assets/fonts/NotoSans-hinted/NotoSansUI-Italic.ttf similarity index 100% rename from assets/fonts/NotoSans-hinted/NotoSansUI-Italic.ttf rename to linphone-desktop/assets/fonts/NotoSans-hinted/NotoSansUI-Italic.ttf diff --git a/assets/fonts/NotoSans-hinted/NotoSansUI-Regular.ttf b/linphone-desktop/assets/fonts/NotoSans-hinted/NotoSansUI-Regular.ttf similarity index 100% rename from assets/fonts/NotoSans-hinted/NotoSansUI-Regular.ttf rename to linphone-desktop/assets/fonts/NotoSans-hinted/NotoSansUI-Regular.ttf diff --git a/assets/fonts/NotoSans-hinted/README b/linphone-desktop/assets/fonts/NotoSans-hinted/README similarity index 100% rename from assets/fonts/NotoSans-hinted/README rename to linphone-desktop/assets/fonts/NotoSans-hinted/README diff --git a/assets/icon.ico b/linphone-desktop/assets/icon.ico similarity index 100% rename from assets/icon.ico rename to linphone-desktop/assets/icon.ico diff --git a/assets/icons/genicons.sh b/linphone-desktop/assets/icons/genicons.sh similarity index 100% rename from assets/icons/genicons.sh rename to linphone-desktop/assets/icons/genicons.sh diff --git a/assets/icons/genicons_1.0.sh b/linphone-desktop/assets/icons/genicons_1.0.sh similarity index 100% rename from assets/icons/genicons_1.0.sh rename to linphone-desktop/assets/icons/genicons_1.0.sh diff --git a/assets/icons/hicolor/128x128/apps/icon.png b/linphone-desktop/assets/icons/hicolor/128x128/apps/icon.png similarity index 100% rename from assets/icons/hicolor/128x128/apps/icon.png rename to linphone-desktop/assets/icons/hicolor/128x128/apps/icon.png diff --git a/assets/icons/hicolor/16x16/apps/icon.png b/linphone-desktop/assets/icons/hicolor/16x16/apps/icon.png similarity index 100% rename from assets/icons/hicolor/16x16/apps/icon.png rename to linphone-desktop/assets/icons/hicolor/16x16/apps/icon.png diff --git a/assets/icons/hicolor/22x22/apps/icon.png b/linphone-desktop/assets/icons/hicolor/22x22/apps/icon.png similarity index 100% rename from assets/icons/hicolor/22x22/apps/icon.png rename to linphone-desktop/assets/icons/hicolor/22x22/apps/icon.png diff --git a/assets/icons/hicolor/24x24/apps/icon.png b/linphone-desktop/assets/icons/hicolor/24x24/apps/icon.png similarity index 100% rename from assets/icons/hicolor/24x24/apps/icon.png rename to linphone-desktop/assets/icons/hicolor/24x24/apps/icon.png diff --git a/assets/icons/hicolor/256x256/apps/icon.png b/linphone-desktop/assets/icons/hicolor/256x256/apps/icon.png similarity index 100% rename from assets/icons/hicolor/256x256/apps/icon.png rename to linphone-desktop/assets/icons/hicolor/256x256/apps/icon.png diff --git a/assets/icons/hicolor/32x32/apps/icon.png b/linphone-desktop/assets/icons/hicolor/32x32/apps/icon.png similarity index 100% rename from assets/icons/hicolor/32x32/apps/icon.png rename to linphone-desktop/assets/icons/hicolor/32x32/apps/icon.png diff --git a/assets/icons/hicolor/64x64/apps/icon.png b/linphone-desktop/assets/icons/hicolor/64x64/apps/icon.png similarity index 100% rename from assets/icons/hicolor/64x64/apps/icon.png rename to linphone-desktop/assets/icons/hicolor/64x64/apps/icon.png diff --git a/assets/images/add_disabled.svg b/linphone-desktop/assets/images/add_disabled.svg similarity index 100% rename from assets/images/add_disabled.svg rename to linphone-desktop/assets/images/add_disabled.svg diff --git a/assets/images/add_hovered.svg b/linphone-desktop/assets/images/add_hovered.svg similarity index 100% rename from assets/images/add_hovered.svg rename to linphone-desktop/assets/images/add_hovered.svg diff --git a/assets/images/add_normal.svg b/linphone-desktop/assets/images/add_normal.svg similarity index 100% rename from assets/images/add_normal.svg rename to linphone-desktop/assets/images/add_normal.svg diff --git a/assets/images/add_pressed.svg b/linphone-desktop/assets/images/add_pressed.svg similarity index 100% rename from assets/images/add_pressed.svg rename to linphone-desktop/assets/images/add_pressed.svg diff --git a/assets/images/attachment_disabled.svg b/linphone-desktop/assets/images/attachment_disabled.svg similarity index 100% rename from assets/images/attachment_disabled.svg rename to linphone-desktop/assets/images/attachment_disabled.svg diff --git a/assets/images/attachment_hovered.svg b/linphone-desktop/assets/images/attachment_hovered.svg similarity index 100% rename from assets/images/attachment_hovered.svg rename to linphone-desktop/assets/images/attachment_hovered.svg diff --git a/assets/images/attachment_normal.svg b/linphone-desktop/assets/images/attachment_normal.svg similarity index 100% rename from assets/images/attachment_normal.svg rename to linphone-desktop/assets/images/attachment_normal.svg diff --git a/assets/images/attachment_pressed.svg b/linphone-desktop/assets/images/attachment_pressed.svg similarity index 100% rename from assets/images/attachment_pressed.svg rename to linphone-desktop/assets/images/attachment_pressed.svg diff --git a/assets/images/auto_answer.svg b/linphone-desktop/assets/images/auto_answer.svg similarity index 100% rename from assets/images/auto_answer.svg rename to linphone-desktop/assets/images/auto_answer.svg diff --git a/assets/images/burger_menu_hovered.svg b/linphone-desktop/assets/images/burger_menu_hovered.svg similarity index 100% rename from assets/images/burger_menu_hovered.svg rename to linphone-desktop/assets/images/burger_menu_hovered.svg diff --git a/assets/images/burger_menu_light_hovered.svg b/linphone-desktop/assets/images/burger_menu_light_hovered.svg similarity index 100% rename from assets/images/burger_menu_light_hovered.svg rename to linphone-desktop/assets/images/burger_menu_light_hovered.svg diff --git a/assets/images/burger_menu_light_normal.svg b/linphone-desktop/assets/images/burger_menu_light_normal.svg similarity index 100% rename from assets/images/burger_menu_light_normal.svg rename to linphone-desktop/assets/images/burger_menu_light_normal.svg diff --git a/assets/images/burger_menu_light_pressed.svg b/linphone-desktop/assets/images/burger_menu_light_pressed.svg similarity index 100% rename from assets/images/burger_menu_light_pressed.svg rename to linphone-desktop/assets/images/burger_menu_light_pressed.svg diff --git a/assets/images/burger_menu_normal.svg b/linphone-desktop/assets/images/burger_menu_normal.svg similarity index 100% rename from assets/images/burger_menu_normal.svg rename to linphone-desktop/assets/images/burger_menu_normal.svg diff --git a/assets/images/burger_menu_pressed.svg b/linphone-desktop/assets/images/burger_menu_pressed.svg similarity index 100% rename from assets/images/burger_menu_pressed.svg rename to linphone-desktop/assets/images/burger_menu_pressed.svg diff --git a/assets/images/call_accept_hovered.svg b/linphone-desktop/assets/images/call_accept_hovered.svg similarity index 100% rename from assets/images/call_accept_hovered.svg rename to linphone-desktop/assets/images/call_accept_hovered.svg diff --git a/assets/images/call_accept_normal.svg b/linphone-desktop/assets/images/call_accept_normal.svg similarity index 100% rename from assets/images/call_accept_normal.svg rename to linphone-desktop/assets/images/call_accept_normal.svg diff --git a/assets/images/call_accept_pressed.svg b/linphone-desktop/assets/images/call_accept_pressed.svg similarity index 100% rename from assets/images/call_accept_pressed.svg rename to linphone-desktop/assets/images/call_accept_pressed.svg diff --git a/assets/images/call_chat_secure_hovered.svg b/linphone-desktop/assets/images/call_chat_secure_hovered.svg similarity index 100% rename from assets/images/call_chat_secure_hovered.svg rename to linphone-desktop/assets/images/call_chat_secure_hovered.svg diff --git a/assets/images/call_chat_secure_normal.svg b/linphone-desktop/assets/images/call_chat_secure_normal.svg similarity index 100% rename from assets/images/call_chat_secure_normal.svg rename to linphone-desktop/assets/images/call_chat_secure_normal.svg diff --git a/assets/images/call_chat_secure_pressed.svg b/linphone-desktop/assets/images/call_chat_secure_pressed.svg similarity index 100% rename from assets/images/call_chat_secure_pressed.svg rename to linphone-desktop/assets/images/call_chat_secure_pressed.svg diff --git a/assets/images/call_chat_unsecure_hovered.svg b/linphone-desktop/assets/images/call_chat_unsecure_hovered.svg similarity index 100% rename from assets/images/call_chat_unsecure_hovered.svg rename to linphone-desktop/assets/images/call_chat_unsecure_hovered.svg diff --git a/assets/images/call_chat_unsecure_normal.svg b/linphone-desktop/assets/images/call_chat_unsecure_normal.svg similarity index 100% rename from assets/images/call_chat_unsecure_normal.svg rename to linphone-desktop/assets/images/call_chat_unsecure_normal.svg diff --git a/assets/images/call_chat_unsecure_pressed.svg b/linphone-desktop/assets/images/call_chat_unsecure_pressed.svg similarity index 100% rename from assets/images/call_chat_unsecure_pressed.svg rename to linphone-desktop/assets/images/call_chat_unsecure_pressed.svg diff --git a/assets/images/call_hovered.svg b/linphone-desktop/assets/images/call_hovered.svg similarity index 100% rename from assets/images/call_hovered.svg rename to linphone-desktop/assets/images/call_hovered.svg diff --git a/assets/images/call_normal.svg b/linphone-desktop/assets/images/call_normal.svg similarity index 100% rename from assets/images/call_normal.svg rename to linphone-desktop/assets/images/call_normal.svg diff --git a/assets/images/call_pressed.svg b/linphone-desktop/assets/images/call_pressed.svg similarity index 100% rename from assets/images/call_pressed.svg rename to linphone-desktop/assets/images/call_pressed.svg diff --git a/assets/images/call_quality_0.svg b/linphone-desktop/assets/images/call_quality_0.svg similarity index 100% rename from assets/images/call_quality_0.svg rename to linphone-desktop/assets/images/call_quality_0.svg diff --git a/assets/images/call_quality_1.svg b/linphone-desktop/assets/images/call_quality_1.svg similarity index 100% rename from assets/images/call_quality_1.svg rename to linphone-desktop/assets/images/call_quality_1.svg diff --git a/assets/images/call_quality_2.svg b/linphone-desktop/assets/images/call_quality_2.svg similarity index 100% rename from assets/images/call_quality_2.svg rename to linphone-desktop/assets/images/call_quality_2.svg diff --git a/assets/images/call_quality_3.svg b/linphone-desktop/assets/images/call_quality_3.svg similarity index 100% rename from assets/images/call_quality_3.svg rename to linphone-desktop/assets/images/call_quality_3.svg diff --git a/assets/images/call_sign_connected.svg b/linphone-desktop/assets/images/call_sign_connected.svg similarity index 100% rename from assets/images/call_sign_connected.svg rename to linphone-desktop/assets/images/call_sign_connected.svg diff --git a/assets/images/call_sign_ended.svg b/linphone-desktop/assets/images/call_sign_ended.svg similarity index 100% rename from assets/images/call_sign_ended.svg rename to linphone-desktop/assets/images/call_sign_ended.svg diff --git a/assets/images/call_sign_incoming.svg b/linphone-desktop/assets/images/call_sign_incoming.svg similarity index 100% rename from assets/images/call_sign_incoming.svg rename to linphone-desktop/assets/images/call_sign_incoming.svg diff --git a/assets/images/call_sign_outgoing.svg b/linphone-desktop/assets/images/call_sign_outgoing.svg similarity index 100% rename from assets/images/call_sign_outgoing.svg rename to linphone-desktop/assets/images/call_sign_outgoing.svg diff --git a/assets/images/call_sign_paused.svg b/linphone-desktop/assets/images/call_sign_paused.svg similarity index 100% rename from assets/images/call_sign_paused.svg rename to linphone-desktop/assets/images/call_sign_paused.svg diff --git a/assets/images/camera.svg b/linphone-desktop/assets/images/camera.svg similarity index 100% rename from assets/images/camera.svg rename to linphone-desktop/assets/images/camera.svg diff --git a/assets/images/camera_off_hovered.svg b/linphone-desktop/assets/images/camera_off_hovered.svg similarity index 100% rename from assets/images/camera_off_hovered.svg rename to linphone-desktop/assets/images/camera_off_hovered.svg diff --git a/assets/images/camera_off_normal.svg b/linphone-desktop/assets/images/camera_off_normal.svg similarity index 100% rename from assets/images/camera_off_normal.svg rename to linphone-desktop/assets/images/camera_off_normal.svg diff --git a/assets/images/camera_off_pressed.svg b/linphone-desktop/assets/images/camera_off_pressed.svg similarity index 100% rename from assets/images/camera_off_pressed.svg rename to linphone-desktop/assets/images/camera_off_pressed.svg diff --git a/assets/images/camera_off_updating.svg b/linphone-desktop/assets/images/camera_off_updating.svg similarity index 100% rename from assets/images/camera_off_updating.svg rename to linphone-desktop/assets/images/camera_off_updating.svg diff --git a/assets/images/camera_on_hovered.svg b/linphone-desktop/assets/images/camera_on_hovered.svg similarity index 100% rename from assets/images/camera_on_hovered.svg rename to linphone-desktop/assets/images/camera_on_hovered.svg diff --git a/assets/images/camera_on_normal.svg b/linphone-desktop/assets/images/camera_on_normal.svg similarity index 100% rename from assets/images/camera_on_normal.svg rename to linphone-desktop/assets/images/camera_on_normal.svg diff --git a/assets/images/camera_on_pressed.svg b/linphone-desktop/assets/images/camera_on_pressed.svg similarity index 100% rename from assets/images/camera_on_pressed.svg rename to linphone-desktop/assets/images/camera_on_pressed.svg diff --git a/assets/images/camera_on_updating.svg b/linphone-desktop/assets/images/camera_on_updating.svg similarity index 100% rename from assets/images/camera_on_updating.svg rename to linphone-desktop/assets/images/camera_on_updating.svg diff --git a/assets/images/cancel_hovered.svg b/linphone-desktop/assets/images/cancel_hovered.svg similarity index 100% rename from assets/images/cancel_hovered.svg rename to linphone-desktop/assets/images/cancel_hovered.svg diff --git a/assets/images/cancel_normal.svg b/linphone-desktop/assets/images/cancel_normal.svg similarity index 100% rename from assets/images/cancel_normal.svg rename to linphone-desktop/assets/images/cancel_normal.svg diff --git a/assets/images/cancel_pressed.svg b/linphone-desktop/assets/images/cancel_pressed.svg similarity index 100% rename from assets/images/cancel_pressed.svg rename to linphone-desktop/assets/images/cancel_pressed.svg diff --git a/assets/images/chat_amount.svg b/linphone-desktop/assets/images/chat_amount.svg similarity index 100% rename from assets/images/chat_amount.svg rename to linphone-desktop/assets/images/chat_amount.svg diff --git a/assets/images/chat_count.svg b/linphone-desktop/assets/images/chat_count.svg similarity index 100% rename from assets/images/chat_count.svg rename to linphone-desktop/assets/images/chat_count.svg diff --git a/assets/images/chat_delivered.svg b/linphone-desktop/assets/images/chat_delivered.svg similarity index 100% rename from assets/images/chat_delivered.svg rename to linphone-desktop/assets/images/chat_delivered.svg diff --git a/assets/images/chat_error.svg b/linphone-desktop/assets/images/chat_error.svg similarity index 100% rename from assets/images/chat_error.svg rename to linphone-desktop/assets/images/chat_error.svg diff --git a/assets/images/chat_hovered.svg b/linphone-desktop/assets/images/chat_hovered.svg similarity index 100% rename from assets/images/chat_hovered.svg rename to linphone-desktop/assets/images/chat_hovered.svg diff --git a/assets/images/chat_is_composing_0.svg b/linphone-desktop/assets/images/chat_is_composing_0.svg similarity index 100% rename from assets/images/chat_is_composing_0.svg rename to linphone-desktop/assets/images/chat_is_composing_0.svg diff --git a/assets/images/chat_is_composing_1.svg b/linphone-desktop/assets/images/chat_is_composing_1.svg similarity index 100% rename from assets/images/chat_is_composing_1.svg rename to linphone-desktop/assets/images/chat_is_composing_1.svg diff --git a/assets/images/chat_is_composing_2.svg b/linphone-desktop/assets/images/chat_is_composing_2.svg similarity index 100% rename from assets/images/chat_is_composing_2.svg rename to linphone-desktop/assets/images/chat_is_composing_2.svg diff --git a/assets/images/chat_is_composing_3.svg b/linphone-desktop/assets/images/chat_is_composing_3.svg similarity index 100% rename from assets/images/chat_is_composing_3.svg rename to linphone-desktop/assets/images/chat_is_composing_3.svg diff --git a/assets/images/chat_normal.svg b/linphone-desktop/assets/images/chat_normal.svg similarity index 100% rename from assets/images/chat_normal.svg rename to linphone-desktop/assets/images/chat_normal.svg diff --git a/assets/images/chat_pressed.svg b/linphone-desktop/assets/images/chat_pressed.svg similarity index 100% rename from assets/images/chat_pressed.svg rename to linphone-desktop/assets/images/chat_pressed.svg diff --git a/assets/images/chat_read.svg b/linphone-desktop/assets/images/chat_read.svg similarity index 100% rename from assets/images/chat_read.svg rename to linphone-desktop/assets/images/chat_read.svg diff --git a/assets/images/collapse.svg b/linphone-desktop/assets/images/collapse.svg similarity index 100% rename from assets/images/collapse.svg rename to linphone-desktop/assets/images/collapse.svg diff --git a/assets/images/contact_add.svg b/linphone-desktop/assets/images/contact_add.svg similarity index 100% rename from assets/images/contact_add.svg rename to linphone-desktop/assets/images/contact_add.svg diff --git a/assets/images/contact_add_hovered.svg b/linphone-desktop/assets/images/contact_add_hovered.svg similarity index 100% rename from assets/images/contact_add_hovered.svg rename to linphone-desktop/assets/images/contact_add_hovered.svg diff --git a/assets/images/contact_add_normal.svg b/linphone-desktop/assets/images/contact_add_normal.svg similarity index 100% rename from assets/images/contact_add_normal.svg rename to linphone-desktop/assets/images/contact_add_normal.svg diff --git a/assets/images/contact_add_pressed.svg b/linphone-desktop/assets/images/contact_add_pressed.svg similarity index 100% rename from assets/images/contact_add_pressed.svg rename to linphone-desktop/assets/images/contact_add_pressed.svg diff --git a/assets/images/contact_card_photo_disabled.svg b/linphone-desktop/assets/images/contact_card_photo_disabled.svg similarity index 100% rename from assets/images/contact_card_photo_disabled.svg rename to linphone-desktop/assets/images/contact_card_photo_disabled.svg diff --git a/assets/images/contact_card_photo_hovered.svg b/linphone-desktop/assets/images/contact_card_photo_hovered.svg similarity index 100% rename from assets/images/contact_card_photo_hovered.svg rename to linphone-desktop/assets/images/contact_card_photo_hovered.svg diff --git a/assets/images/contact_card_photo_normal.svg b/linphone-desktop/assets/images/contact_card_photo_normal.svg similarity index 100% rename from assets/images/contact_card_photo_normal.svg rename to linphone-desktop/assets/images/contact_card_photo_normal.svg diff --git a/assets/images/contact_card_photo_pressed.svg b/linphone-desktop/assets/images/contact_card_photo_pressed.svg similarity index 100% rename from assets/images/contact_card_photo_pressed.svg rename to linphone-desktop/assets/images/contact_card_photo_pressed.svg diff --git a/assets/images/contact_edit_hovered.svg b/linphone-desktop/assets/images/contact_edit_hovered.svg similarity index 100% rename from assets/images/contact_edit_hovered.svg rename to linphone-desktop/assets/images/contact_edit_hovered.svg diff --git a/assets/images/contact_edit_normal.svg b/linphone-desktop/assets/images/contact_edit_normal.svg similarity index 100% rename from assets/images/contact_edit_normal.svg rename to linphone-desktop/assets/images/contact_edit_normal.svg diff --git a/assets/images/contact_edit_pressed.svg b/linphone-desktop/assets/images/contact_edit_pressed.svg similarity index 100% rename from assets/images/contact_edit_pressed.svg rename to linphone-desktop/assets/images/contact_edit_pressed.svg diff --git a/assets/images/contact_normal.svg b/linphone-desktop/assets/images/contact_normal.svg similarity index 100% rename from assets/images/contact_normal.svg rename to linphone-desktop/assets/images/contact_normal.svg diff --git a/assets/images/contact_selected.svg b/linphone-desktop/assets/images/contact_selected.svg similarity index 100% rename from assets/images/contact_selected.svg rename to linphone-desktop/assets/images/contact_selected.svg diff --git a/assets/images/declined_incoming_call.svg b/linphone-desktop/assets/images/declined_incoming_call.svg similarity index 100% rename from assets/images/declined_incoming_call.svg rename to linphone-desktop/assets/images/declined_incoming_call.svg diff --git a/assets/images/declined_outgoing_call.svg b/linphone-desktop/assets/images/declined_outgoing_call.svg similarity index 100% rename from assets/images/declined_outgoing_call.svg rename to linphone-desktop/assets/images/declined_outgoing_call.svg diff --git a/assets/images/delete_hovered.svg b/linphone-desktop/assets/images/delete_hovered.svg similarity index 100% rename from assets/images/delete_hovered.svg rename to linphone-desktop/assets/images/delete_hovered.svg diff --git a/assets/images/delete_normal.svg b/linphone-desktop/assets/images/delete_normal.svg similarity index 100% rename from assets/images/delete_normal.svg rename to linphone-desktop/assets/images/delete_normal.svg diff --git a/assets/images/delete_pressed.svg b/linphone-desktop/assets/images/delete_pressed.svg similarity index 100% rename from assets/images/delete_pressed.svg rename to linphone-desktop/assets/images/delete_pressed.svg diff --git a/assets/images/download.svg b/linphone-desktop/assets/images/download.svg similarity index 100% rename from assets/images/download.svg rename to linphone-desktop/assets/images/download.svg diff --git a/assets/images/drop_down.svg b/linphone-desktop/assets/images/drop_down.svg similarity index 100% rename from assets/images/drop_down.svg rename to linphone-desktop/assets/images/drop_down.svg diff --git a/assets/images/edit_hovered.svg b/linphone-desktop/assets/images/edit_hovered.svg similarity index 100% rename from assets/images/edit_hovered.svg rename to linphone-desktop/assets/images/edit_hovered.svg diff --git a/assets/images/edit_normal.svg b/linphone-desktop/assets/images/edit_normal.svg similarity index 100% rename from assets/images/edit_normal.svg rename to linphone-desktop/assets/images/edit_normal.svg diff --git a/assets/images/edit_pressed.svg b/linphone-desktop/assets/images/edit_pressed.svg similarity index 100% rename from assets/images/edit_pressed.svg rename to linphone-desktop/assets/images/edit_pressed.svg diff --git a/assets/images/ended_call.svg b/linphone-desktop/assets/images/ended_call.svg similarity index 100% rename from assets/images/ended_call.svg rename to linphone-desktop/assets/images/ended_call.svg diff --git a/assets/images/file_hovered.svg b/linphone-desktop/assets/images/file_hovered.svg similarity index 100% rename from assets/images/file_hovered.svg rename to linphone-desktop/assets/images/file_hovered.svg diff --git a/assets/images/file_normal.svg b/linphone-desktop/assets/images/file_normal.svg similarity index 100% rename from assets/images/file_normal.svg rename to linphone-desktop/assets/images/file_normal.svg diff --git a/assets/images/file_pressed.svg b/linphone-desktop/assets/images/file_pressed.svg similarity index 100% rename from assets/images/file_pressed.svg rename to linphone-desktop/assets/images/file_pressed.svg diff --git a/assets/images/file_sign.svg b/linphone-desktop/assets/images/file_sign.svg similarity index 100% rename from assets/images/file_sign.svg rename to linphone-desktop/assets/images/file_sign.svg diff --git a/assets/images/filter.svg b/linphone-desktop/assets/images/filter.svg similarity index 100% rename from assets/images/filter.svg rename to linphone-desktop/assets/images/filter.svg diff --git a/assets/images/folder_hovered.svg b/linphone-desktop/assets/images/folder_hovered.svg similarity index 100% rename from assets/images/folder_hovered.svg rename to linphone-desktop/assets/images/folder_hovered.svg diff --git a/assets/images/folder_normal.svg b/linphone-desktop/assets/images/folder_normal.svg similarity index 100% rename from assets/images/folder_normal.svg rename to linphone-desktop/assets/images/folder_normal.svg diff --git a/assets/images/folder_pressed.svg b/linphone-desktop/assets/images/folder_pressed.svg similarity index 100% rename from assets/images/folder_pressed.svg rename to linphone-desktop/assets/images/folder_pressed.svg diff --git a/assets/images/fullscreen_hovered.svg b/linphone-desktop/assets/images/fullscreen_hovered.svg similarity index 100% rename from assets/images/fullscreen_hovered.svg rename to linphone-desktop/assets/images/fullscreen_hovered.svg diff --git a/assets/images/fullscreen_normal.svg b/linphone-desktop/assets/images/fullscreen_normal.svg similarity index 100% rename from assets/images/fullscreen_normal.svg rename to linphone-desktop/assets/images/fullscreen_normal.svg diff --git a/assets/images/fullscreen_pressed.svg b/linphone-desktop/assets/images/fullscreen_pressed.svg similarity index 100% rename from assets/images/fullscreen_pressed.svg rename to linphone-desktop/assets/images/fullscreen_pressed.svg diff --git a/assets/images/generic_error.svg b/linphone-desktop/assets/images/generic_error.svg similarity index 100% rename from assets/images/generic_error.svg rename to linphone-desktop/assets/images/generic_error.svg diff --git a/assets/images/generic_error_hovered.svg b/linphone-desktop/assets/images/generic_error_hovered.svg similarity index 100% rename from assets/images/generic_error_hovered.svg rename to linphone-desktop/assets/images/generic_error_hovered.svg diff --git a/assets/images/generic_error_normal.svg b/linphone-desktop/assets/images/generic_error_normal.svg similarity index 100% rename from assets/images/generic_error_normal.svg rename to linphone-desktop/assets/images/generic_error_normal.svg diff --git a/assets/images/generic_error_pressed.svg b/linphone-desktop/assets/images/generic_error_pressed.svg similarity index 100% rename from assets/images/generic_error_pressed.svg rename to linphone-desktop/assets/images/generic_error_pressed.svg diff --git a/assets/images/hangup_hovered.svg b/linphone-desktop/assets/images/hangup_hovered.svg similarity index 100% rename from assets/images/hangup_hovered.svg rename to linphone-desktop/assets/images/hangup_hovered.svg diff --git a/assets/images/hangup_normal.svg b/linphone-desktop/assets/images/hangup_normal.svg similarity index 100% rename from assets/images/hangup_normal.svg rename to linphone-desktop/assets/images/hangup_normal.svg diff --git a/assets/images/hangup_pressed.svg b/linphone-desktop/assets/images/hangup_pressed.svg similarity index 100% rename from assets/images/hangup_pressed.svg rename to linphone-desktop/assets/images/hangup_pressed.svg diff --git a/assets/images/history.svg b/linphone-desktop/assets/images/history.svg similarity index 100% rename from assets/images/history.svg rename to linphone-desktop/assets/images/history.svg diff --git a/assets/images/history_hovered.svg b/linphone-desktop/assets/images/history_hovered.svg similarity index 100% rename from assets/images/history_hovered.svg rename to linphone-desktop/assets/images/history_hovered.svg diff --git a/assets/images/history_normal.svg b/linphone-desktop/assets/images/history_normal.svg similarity index 100% rename from assets/images/history_normal.svg rename to linphone-desktop/assets/images/history_normal.svg diff --git a/assets/images/history_pressed.svg b/linphone-desktop/assets/images/history_pressed.svg similarity index 100% rename from assets/images/history_pressed.svg rename to linphone-desktop/assets/images/history_pressed.svg diff --git a/assets/images/home_account_assistant.svg b/linphone-desktop/assets/images/home_account_assistant.svg similarity index 100% rename from assets/images/home_account_assistant.svg rename to linphone-desktop/assets/images/home_account_assistant.svg diff --git a/assets/images/home_invite_friends.svg b/linphone-desktop/assets/images/home_invite_friends.svg similarity index 100% rename from assets/images/home_invite_friends.svg rename to linphone-desktop/assets/images/home_invite_friends.svg diff --git a/assets/images/home_normal.svg b/linphone-desktop/assets/images/home_normal.svg similarity index 100% rename from assets/images/home_normal.svg rename to linphone-desktop/assets/images/home_normal.svg diff --git a/assets/images/home_selected.svg b/linphone-desktop/assets/images/home_selected.svg similarity index 100% rename from assets/images/home_selected.svg rename to linphone-desktop/assets/images/home_selected.svg diff --git a/assets/images/home_use_linphone.svg b/linphone-desktop/assets/images/home_use_linphone.svg similarity index 100% rename from assets/images/home_use_linphone.svg rename to linphone-desktop/assets/images/home_use_linphone.svg diff --git a/assets/images/incoming_call.svg b/linphone-desktop/assets/images/incoming_call.svg similarity index 100% rename from assets/images/incoming_call.svg rename to linphone-desktop/assets/images/incoming_call.svg diff --git a/assets/images/led_green.svg b/linphone-desktop/assets/images/led_green.svg similarity index 100% rename from assets/images/led_green.svg rename to linphone-desktop/assets/images/led_green.svg diff --git a/assets/images/led_orange.svg b/linphone-desktop/assets/images/led_orange.svg similarity index 100% rename from assets/images/led_orange.svg rename to linphone-desktop/assets/images/led_orange.svg diff --git a/assets/images/led_red.svg b/linphone-desktop/assets/images/led_red.svg similarity index 100% rename from assets/images/led_red.svg rename to linphone-desktop/assets/images/led_red.svg diff --git a/assets/images/led_white.svg b/linphone-desktop/assets/images/led_white.svg similarity index 100% rename from assets/images/led_white.svg rename to linphone-desktop/assets/images/led_white.svg diff --git a/assets/images/linphone_logo.svg b/linphone-desktop/assets/images/linphone_logo.svg similarity index 100% rename from assets/images/linphone_logo.svg rename to linphone-desktop/assets/images/linphone_logo.svg diff --git a/assets/images/message_sign.svg b/linphone-desktop/assets/images/message_sign.svg similarity index 100% rename from assets/images/message_sign.svg rename to linphone-desktop/assets/images/message_sign.svg diff --git a/assets/images/micro.svg b/linphone-desktop/assets/images/micro.svg similarity index 100% rename from assets/images/micro.svg rename to linphone-desktop/assets/images/micro.svg diff --git a/assets/images/micro_off_hovered.svg b/linphone-desktop/assets/images/micro_off_hovered.svg similarity index 100% rename from assets/images/micro_off_hovered.svg rename to linphone-desktop/assets/images/micro_off_hovered.svg diff --git a/assets/images/micro_off_normal.svg b/linphone-desktop/assets/images/micro_off_normal.svg similarity index 100% rename from assets/images/micro_off_normal.svg rename to linphone-desktop/assets/images/micro_off_normal.svg diff --git a/assets/images/micro_off_pressed.svg b/linphone-desktop/assets/images/micro_off_pressed.svg similarity index 100% rename from assets/images/micro_off_pressed.svg rename to linphone-desktop/assets/images/micro_off_pressed.svg diff --git a/assets/images/micro_on_hovered.svg b/linphone-desktop/assets/images/micro_on_hovered.svg similarity index 100% rename from assets/images/micro_on_hovered.svg rename to linphone-desktop/assets/images/micro_on_hovered.svg diff --git a/assets/images/micro_on_normal.svg b/linphone-desktop/assets/images/micro_on_normal.svg similarity index 100% rename from assets/images/micro_on_normal.svg rename to linphone-desktop/assets/images/micro_on_normal.svg diff --git a/assets/images/micro_on_pressed.svg b/linphone-desktop/assets/images/micro_on_pressed.svg similarity index 100% rename from assets/images/micro_on_pressed.svg rename to linphone-desktop/assets/images/micro_on_pressed.svg diff --git a/assets/images/missed_incoming_call.svg b/linphone-desktop/assets/images/missed_incoming_call.svg similarity index 100% rename from assets/images/missed_incoming_call.svg rename to linphone-desktop/assets/images/missed_incoming_call.svg diff --git a/assets/images/missed_outgoing_call.svg b/linphone-desktop/assets/images/missed_outgoing_call.svg similarity index 100% rename from assets/images/missed_outgoing_call.svg rename to linphone-desktop/assets/images/missed_outgoing_call.svg diff --git a/assets/images/new_call_hovered.svg b/linphone-desktop/assets/images/new_call_hovered.svg similarity index 100% rename from assets/images/new_call_hovered.svg rename to linphone-desktop/assets/images/new_call_hovered.svg diff --git a/assets/images/new_call_normal.svg b/linphone-desktop/assets/images/new_call_normal.svg similarity index 100% rename from assets/images/new_call_normal.svg rename to linphone-desktop/assets/images/new_call_normal.svg diff --git a/assets/images/new_call_pressed.svg b/linphone-desktop/assets/images/new_call_pressed.svg similarity index 100% rename from assets/images/new_call_pressed.svg rename to linphone-desktop/assets/images/new_call_pressed.svg diff --git a/assets/images/new_conference_hovered.svg b/linphone-desktop/assets/images/new_conference_hovered.svg similarity index 100% rename from assets/images/new_conference_hovered.svg rename to linphone-desktop/assets/images/new_conference_hovered.svg diff --git a/assets/images/new_conference_normal.svg b/linphone-desktop/assets/images/new_conference_normal.svg similarity index 100% rename from assets/images/new_conference_normal.svg rename to linphone-desktop/assets/images/new_conference_normal.svg diff --git a/assets/images/new_conference_pressed.svg b/linphone-desktop/assets/images/new_conference_pressed.svg similarity index 100% rename from assets/images/new_conference_pressed.svg rename to linphone-desktop/assets/images/new_conference_pressed.svg diff --git a/assets/images/options_hovered.svg b/linphone-desktop/assets/images/options_hovered.svg similarity index 100% rename from assets/images/options_hovered.svg rename to linphone-desktop/assets/images/options_hovered.svg diff --git a/assets/images/options_normal.svg b/linphone-desktop/assets/images/options_normal.svg similarity index 100% rename from assets/images/options_normal.svg rename to linphone-desktop/assets/images/options_normal.svg diff --git a/assets/images/options_pressed.svg b/linphone-desktop/assets/images/options_pressed.svg similarity index 100% rename from assets/images/options_pressed.svg rename to linphone-desktop/assets/images/options_pressed.svg diff --git a/assets/images/outgoing_call.svg b/linphone-desktop/assets/images/outgoing_call.svg similarity index 100% rename from assets/images/outgoing_call.svg rename to linphone-desktop/assets/images/outgoing_call.svg diff --git a/assets/images/pause_off_hovered.svg b/linphone-desktop/assets/images/pause_off_hovered.svg similarity index 100% rename from assets/images/pause_off_hovered.svg rename to linphone-desktop/assets/images/pause_off_hovered.svg diff --git a/assets/images/pause_off_normal.svg b/linphone-desktop/assets/images/pause_off_normal.svg similarity index 100% rename from assets/images/pause_off_normal.svg rename to linphone-desktop/assets/images/pause_off_normal.svg diff --git a/assets/images/pause_off_pressed.svg b/linphone-desktop/assets/images/pause_off_pressed.svg similarity index 100% rename from assets/images/pause_off_pressed.svg rename to linphone-desktop/assets/images/pause_off_pressed.svg diff --git a/assets/images/pause_off_updating.svg b/linphone-desktop/assets/images/pause_off_updating.svg similarity index 100% rename from assets/images/pause_off_updating.svg rename to linphone-desktop/assets/images/pause_off_updating.svg diff --git a/assets/images/pause_on_hovered.svg b/linphone-desktop/assets/images/pause_on_hovered.svg similarity index 100% rename from assets/images/pause_on_hovered.svg rename to linphone-desktop/assets/images/pause_on_hovered.svg diff --git a/assets/images/pause_on_normal.svg b/linphone-desktop/assets/images/pause_on_normal.svg similarity index 100% rename from assets/images/pause_on_normal.svg rename to linphone-desktop/assets/images/pause_on_normal.svg diff --git a/assets/images/pause_on_pressed.svg b/linphone-desktop/assets/images/pause_on_pressed.svg similarity index 100% rename from assets/images/pause_on_pressed.svg rename to linphone-desktop/assets/images/pause_on_pressed.svg diff --git a/assets/images/pause_on_updating.svg b/linphone-desktop/assets/images/pause_on_updating.svg similarity index 100% rename from assets/images/pause_on_updating.svg rename to linphone-desktop/assets/images/pause_on_updating.svg diff --git a/assets/images/record_off.svg b/linphone-desktop/assets/images/record_off.svg similarity index 100% rename from assets/images/record_off.svg rename to linphone-desktop/assets/images/record_off.svg diff --git a/assets/images/record_on.svg b/linphone-desktop/assets/images/record_on.svg similarity index 100% rename from assets/images/record_on.svg rename to linphone-desktop/assets/images/record_on.svg diff --git a/assets/images/recording_sign.svg b/linphone-desktop/assets/images/recording_sign.svg similarity index 100% rename from assets/images/recording_sign.svg rename to linphone-desktop/assets/images/recording_sign.svg diff --git a/assets/images/screenshot_hovered.svg b/linphone-desktop/assets/images/screenshot_hovered.svg similarity index 100% rename from assets/images/screenshot_hovered.svg rename to linphone-desktop/assets/images/screenshot_hovered.svg diff --git a/assets/images/screenshot_normal.svg b/linphone-desktop/assets/images/screenshot_normal.svg similarity index 100% rename from assets/images/screenshot_normal.svg rename to linphone-desktop/assets/images/screenshot_normal.svg diff --git a/assets/images/screenshot_pressed.svg b/linphone-desktop/assets/images/screenshot_pressed.svg similarity index 100% rename from assets/images/screenshot_pressed.svg rename to linphone-desktop/assets/images/screenshot_pressed.svg diff --git a/assets/images/search.svg b/linphone-desktop/assets/images/search.svg similarity index 100% rename from assets/images/search.svg rename to linphone-desktop/assets/images/search.svg diff --git a/assets/images/settings_advanced_normal.svg b/linphone-desktop/assets/images/settings_advanced_normal.svg similarity index 100% rename from assets/images/settings_advanced_normal.svg rename to linphone-desktop/assets/images/settings_advanced_normal.svg diff --git a/assets/images/settings_advanced_selected.svg b/linphone-desktop/assets/images/settings_advanced_selected.svg similarity index 100% rename from assets/images/settings_advanced_selected.svg rename to linphone-desktop/assets/images/settings_advanced_selected.svg diff --git a/assets/images/settings_audio_normal.svg b/linphone-desktop/assets/images/settings_audio_normal.svg similarity index 100% rename from assets/images/settings_audio_normal.svg rename to linphone-desktop/assets/images/settings_audio_normal.svg diff --git a/assets/images/settings_audio_selected.svg b/linphone-desktop/assets/images/settings_audio_selected.svg similarity index 100% rename from assets/images/settings_audio_selected.svg rename to linphone-desktop/assets/images/settings_audio_selected.svg diff --git a/assets/images/settings_call_normal.svg b/linphone-desktop/assets/images/settings_call_normal.svg similarity index 100% rename from assets/images/settings_call_normal.svg rename to linphone-desktop/assets/images/settings_call_normal.svg diff --git a/assets/images/settings_call_selected.svg b/linphone-desktop/assets/images/settings_call_selected.svg similarity index 100% rename from assets/images/settings_call_selected.svg rename to linphone-desktop/assets/images/settings_call_selected.svg diff --git a/assets/images/settings_network_normal.svg b/linphone-desktop/assets/images/settings_network_normal.svg similarity index 100% rename from assets/images/settings_network_normal.svg rename to linphone-desktop/assets/images/settings_network_normal.svg diff --git a/assets/images/settings_network_selected.svg b/linphone-desktop/assets/images/settings_network_selected.svg similarity index 100% rename from assets/images/settings_network_selected.svg rename to linphone-desktop/assets/images/settings_network_selected.svg diff --git a/assets/images/settings_sip_accounts_normal.svg b/linphone-desktop/assets/images/settings_sip_accounts_normal.svg similarity index 100% rename from assets/images/settings_sip_accounts_normal.svg rename to linphone-desktop/assets/images/settings_sip_accounts_normal.svg diff --git a/assets/images/settings_sip_accounts_selected.svg b/linphone-desktop/assets/images/settings_sip_accounts_selected.svg similarity index 100% rename from assets/images/settings_sip_accounts_selected.svg rename to linphone-desktop/assets/images/settings_sip_accounts_selected.svg diff --git a/assets/images/settings_video_normal.svg b/linphone-desktop/assets/images/settings_video_normal.svg similarity index 100% rename from assets/images/settings_video_normal.svg rename to linphone-desktop/assets/images/settings_video_normal.svg diff --git a/assets/images/settings_video_selected.svg b/linphone-desktop/assets/images/settings_video_selected.svg similarity index 100% rename from assets/images/settings_video_selected.svg rename to linphone-desktop/assets/images/settings_video_selected.svg diff --git a/assets/images/snapshot_sign.svg b/linphone-desktop/assets/images/snapshot_sign.svg similarity index 100% rename from assets/images/snapshot_sign.svg rename to linphone-desktop/assets/images/snapshot_sign.svg diff --git a/assets/images/speaker.svg b/linphone-desktop/assets/images/speaker.svg similarity index 100% rename from assets/images/speaker.svg rename to linphone-desktop/assets/images/speaker.svg diff --git a/assets/images/speaker_off_hovered.svg b/linphone-desktop/assets/images/speaker_off_hovered.svg similarity index 100% rename from assets/images/speaker_off_hovered.svg rename to linphone-desktop/assets/images/speaker_off_hovered.svg diff --git a/assets/images/speaker_off_normal.svg b/linphone-desktop/assets/images/speaker_off_normal.svg similarity index 100% rename from assets/images/speaker_off_normal.svg rename to linphone-desktop/assets/images/speaker_off_normal.svg diff --git a/assets/images/speaker_off_pressed.svg b/linphone-desktop/assets/images/speaker_off_pressed.svg similarity index 100% rename from assets/images/speaker_off_pressed.svg rename to linphone-desktop/assets/images/speaker_off_pressed.svg diff --git a/assets/images/speaker_on_hovered.svg b/linphone-desktop/assets/images/speaker_on_hovered.svg similarity index 100% rename from assets/images/speaker_on_hovered.svg rename to linphone-desktop/assets/images/speaker_on_hovered.svg diff --git a/assets/images/speaker_on_normal.svg b/linphone-desktop/assets/images/speaker_on_normal.svg similarity index 100% rename from assets/images/speaker_on_normal.svg rename to linphone-desktop/assets/images/speaker_on_normal.svg diff --git a/assets/images/speaker_on_pressed.svg b/linphone-desktop/assets/images/speaker_on_pressed.svg similarity index 100% rename from assets/images/speaker_on_pressed.svg rename to linphone-desktop/assets/images/speaker_on_pressed.svg diff --git a/assets/images/tel_keypad_hovered.svg b/linphone-desktop/assets/images/tel_keypad_hovered.svg similarity index 100% rename from assets/images/tel_keypad_hovered.svg rename to linphone-desktop/assets/images/tel_keypad_hovered.svg diff --git a/assets/images/tel_keypad_normal.svg b/linphone-desktop/assets/images/tel_keypad_normal.svg similarity index 100% rename from assets/images/tel_keypad_normal.svg rename to linphone-desktop/assets/images/tel_keypad_normal.svg diff --git a/assets/images/tel_keypad_pressed.svg b/linphone-desktop/assets/images/tel_keypad_pressed.svg similarity index 100% rename from assets/images/tel_keypad_pressed.svg rename to linphone-desktop/assets/images/tel_keypad_pressed.svg diff --git a/assets/images/timeline_history.svg b/linphone-desktop/assets/images/timeline_history.svg similarity index 100% rename from assets/images/timeline_history.svg rename to linphone-desktop/assets/images/timeline_history.svg diff --git a/assets/images/tooltip_arrow_bottom.svg b/linphone-desktop/assets/images/tooltip_arrow_bottom.svg similarity index 100% rename from assets/images/tooltip_arrow_bottom.svg rename to linphone-desktop/assets/images/tooltip_arrow_bottom.svg diff --git a/assets/images/tooltip_arrow_left.svg b/linphone-desktop/assets/images/tooltip_arrow_left.svg similarity index 100% rename from assets/images/tooltip_arrow_left.svg rename to linphone-desktop/assets/images/tooltip_arrow_left.svg diff --git a/assets/images/tooltip_arrow_right.svg b/linphone-desktop/assets/images/tooltip_arrow_right.svg similarity index 100% rename from assets/images/tooltip_arrow_right.svg rename to linphone-desktop/assets/images/tooltip_arrow_right.svg diff --git a/assets/images/tooltip_arrow_top.svg b/linphone-desktop/assets/images/tooltip_arrow_top.svg similarity index 100% rename from assets/images/tooltip_arrow_top.svg rename to linphone-desktop/assets/images/tooltip_arrow_top.svg diff --git a/assets/images/transfer_hovered.svg b/linphone-desktop/assets/images/transfer_hovered.svg similarity index 100% rename from assets/images/transfer_hovered.svg rename to linphone-desktop/assets/images/transfer_hovered.svg diff --git a/assets/images/transfer_normal.svg b/linphone-desktop/assets/images/transfer_normal.svg similarity index 100% rename from assets/images/transfer_normal.svg rename to linphone-desktop/assets/images/transfer_normal.svg diff --git a/assets/images/transfer_pressed.svg b/linphone-desktop/assets/images/transfer_pressed.svg similarity index 100% rename from assets/images/transfer_pressed.svg rename to linphone-desktop/assets/images/transfer_pressed.svg diff --git a/assets/images/update_sign.svg b/linphone-desktop/assets/images/update_sign.svg similarity index 100% rename from assets/images/update_sign.svg rename to linphone-desktop/assets/images/update_sign.svg diff --git a/assets/images/video_call_accept_hovered.svg b/linphone-desktop/assets/images/video_call_accept_hovered.svg similarity index 100% rename from assets/images/video_call_accept_hovered.svg rename to linphone-desktop/assets/images/video_call_accept_hovered.svg diff --git a/assets/images/video_call_accept_normal.svg b/linphone-desktop/assets/images/video_call_accept_normal.svg similarity index 100% rename from assets/images/video_call_accept_normal.svg rename to linphone-desktop/assets/images/video_call_accept_normal.svg diff --git a/assets/images/video_call_accept_pressed.svg b/linphone-desktop/assets/images/video_call_accept_pressed.svg similarity index 100% rename from assets/images/video_call_accept_pressed.svg rename to linphone-desktop/assets/images/video_call_accept_pressed.svg diff --git a/assets/images/video_call_hovered.svg b/linphone-desktop/assets/images/video_call_hovered.svg similarity index 100% rename from assets/images/video_call_hovered.svg rename to linphone-desktop/assets/images/video_call_hovered.svg diff --git a/assets/images/video_call_normal.svg b/linphone-desktop/assets/images/video_call_normal.svg similarity index 100% rename from assets/images/video_call_normal.svg rename to linphone-desktop/assets/images/video_call_normal.svg diff --git a/assets/images/video_call_pressed.svg b/linphone-desktop/assets/images/video_call_pressed.svg similarity index 100% rename from assets/images/video_call_pressed.svg rename to linphone-desktop/assets/images/video_call_pressed.svg diff --git a/assets/images/warning.svg b/linphone-desktop/assets/images/warning.svg similarity index 100% rename from assets/images/warning.svg rename to linphone-desktop/assets/images/warning.svg diff --git a/assets/languages/CMakeLists.txt b/linphone-desktop/assets/languages/CMakeLists.txt similarity index 100% rename from assets/languages/CMakeLists.txt rename to linphone-desktop/assets/languages/CMakeLists.txt diff --git a/assets/languages/ar.ts b/linphone-desktop/assets/languages/ar.ts similarity index 100% rename from assets/languages/ar.ts rename to linphone-desktop/assets/languages/ar.ts diff --git a/assets/languages/az.ts b/linphone-desktop/assets/languages/az.ts similarity index 100% rename from assets/languages/az.ts rename to linphone-desktop/assets/languages/az.ts diff --git a/assets/languages/az@latin.ts b/linphone-desktop/assets/languages/az@latin.ts similarity index 100% rename from assets/languages/az@latin.ts rename to linphone-desktop/assets/languages/az@latin.ts diff --git a/assets/languages/cs.ts b/linphone-desktop/assets/languages/cs.ts similarity index 100% rename from assets/languages/cs.ts rename to linphone-desktop/assets/languages/cs.ts diff --git a/assets/languages/de.ts b/linphone-desktop/assets/languages/de.ts similarity index 100% rename from assets/languages/de.ts rename to linphone-desktop/assets/languages/de.ts diff --git a/assets/languages/de_DE.ts b/linphone-desktop/assets/languages/de_DE.ts similarity index 100% rename from assets/languages/de_DE.ts rename to linphone-desktop/assets/languages/de_DE.ts diff --git a/assets/languages/el.ts b/linphone-desktop/assets/languages/el.ts similarity index 100% rename from assets/languages/el.ts rename to linphone-desktop/assets/languages/el.ts diff --git a/assets/languages/en.ts b/linphone-desktop/assets/languages/en.ts similarity index 100% rename from assets/languages/en.ts rename to linphone-desktop/assets/languages/en.ts diff --git a/assets/languages/es.ts b/linphone-desktop/assets/languages/es.ts similarity index 100% rename from assets/languages/es.ts rename to linphone-desktop/assets/languages/es.ts diff --git a/assets/languages/es_AR.ts b/linphone-desktop/assets/languages/es_AR.ts similarity index 100% rename from assets/languages/es_AR.ts rename to linphone-desktop/assets/languages/es_AR.ts diff --git a/assets/languages/fi.ts b/linphone-desktop/assets/languages/fi.ts similarity index 100% rename from assets/languages/fi.ts rename to linphone-desktop/assets/languages/fi.ts diff --git a/assets/languages/fr_FR.ts b/linphone-desktop/assets/languages/fr_FR.ts similarity index 100% rename from assets/languages/fr_FR.ts rename to linphone-desktop/assets/languages/fr_FR.ts diff --git a/assets/languages/he.ts b/linphone-desktop/assets/languages/he.ts similarity index 100% rename from assets/languages/he.ts rename to linphone-desktop/assets/languages/he.ts diff --git a/assets/languages/hu.ts b/linphone-desktop/assets/languages/hu.ts similarity index 100% rename from assets/languages/hu.ts rename to linphone-desktop/assets/languages/hu.ts diff --git a/assets/languages/it.ts b/linphone-desktop/assets/languages/it.ts similarity index 100% rename from assets/languages/it.ts rename to linphone-desktop/assets/languages/it.ts diff --git a/assets/languages/ja.ts b/linphone-desktop/assets/languages/ja.ts similarity index 100% rename from assets/languages/ja.ts rename to linphone-desktop/assets/languages/ja.ts diff --git a/assets/languages/ka.ts b/linphone-desktop/assets/languages/ka.ts similarity index 100% rename from assets/languages/ka.ts rename to linphone-desktop/assets/languages/ka.ts diff --git a/assets/languages/ko_KR.ts b/linphone-desktop/assets/languages/ko_KR.ts similarity index 100% rename from assets/languages/ko_KR.ts rename to linphone-desktop/assets/languages/ko_KR.ts diff --git a/assets/languages/lt.ts b/linphone-desktop/assets/languages/lt.ts similarity index 100% rename from assets/languages/lt.ts rename to linphone-desktop/assets/languages/lt.ts diff --git a/assets/languages/mk_MK.ts b/linphone-desktop/assets/languages/mk_MK.ts similarity index 100% rename from assets/languages/mk_MK.ts rename to linphone-desktop/assets/languages/mk_MK.ts diff --git a/assets/languages/nb_NO.ts b/linphone-desktop/assets/languages/nb_NO.ts similarity index 100% rename from assets/languages/nb_NO.ts rename to linphone-desktop/assets/languages/nb_NO.ts diff --git a/assets/languages/nl.ts b/linphone-desktop/assets/languages/nl.ts similarity index 100% rename from assets/languages/nl.ts rename to linphone-desktop/assets/languages/nl.ts diff --git a/assets/languages/pl.ts b/linphone-desktop/assets/languages/pl.ts similarity index 100% rename from assets/languages/pl.ts rename to linphone-desktop/assets/languages/pl.ts diff --git a/assets/languages/pl_PL.ts b/linphone-desktop/assets/languages/pl_PL.ts similarity index 100% rename from assets/languages/pl_PL.ts rename to linphone-desktop/assets/languages/pl_PL.ts diff --git a/assets/languages/pt_BR.ts b/linphone-desktop/assets/languages/pt_BR.ts similarity index 100% rename from assets/languages/pt_BR.ts rename to linphone-desktop/assets/languages/pt_BR.ts diff --git a/assets/languages/ru.ts b/linphone-desktop/assets/languages/ru.ts similarity index 100% rename from assets/languages/ru.ts rename to linphone-desktop/assets/languages/ru.ts diff --git a/assets/languages/ru_RU.ts b/linphone-desktop/assets/languages/ru_RU.ts similarity index 100% rename from assets/languages/ru_RU.ts rename to linphone-desktop/assets/languages/ru_RU.ts diff --git a/assets/languages/sr.ts b/linphone-desktop/assets/languages/sr.ts similarity index 100% rename from assets/languages/sr.ts rename to linphone-desktop/assets/languages/sr.ts diff --git a/assets/languages/sv.ts b/linphone-desktop/assets/languages/sv.ts similarity index 100% rename from assets/languages/sv.ts rename to linphone-desktop/assets/languages/sv.ts diff --git a/assets/languages/tr.ts b/linphone-desktop/assets/languages/tr.ts similarity index 100% rename from assets/languages/tr.ts rename to linphone-desktop/assets/languages/tr.ts diff --git a/assets/languages/uk.ts b/linphone-desktop/assets/languages/uk.ts similarity index 100% rename from assets/languages/uk.ts rename to linphone-desktop/assets/languages/uk.ts diff --git a/assets/languages/zh-Hant.ts b/linphone-desktop/assets/languages/zh-Hant.ts similarity index 100% rename from assets/languages/zh-Hant.ts rename to linphone-desktop/assets/languages/zh-Hant.ts diff --git a/assets/languages/zh.ts b/linphone-desktop/assets/languages/zh.ts similarity index 100% rename from assets/languages/zh.ts rename to linphone-desktop/assets/languages/zh.ts diff --git a/assets/languages/zh_CN.GB2312.ts b/linphone-desktop/assets/languages/zh_CN.GB2312.ts similarity index 100% rename from assets/languages/zh_CN.GB2312.ts rename to linphone-desktop/assets/languages/zh_CN.GB2312.ts diff --git a/assets/languages/zh_CN.ts b/linphone-desktop/assets/languages/zh_CN.ts similarity index 100% rename from assets/languages/zh_CN.ts rename to linphone-desktop/assets/languages/zh_CN.ts diff --git a/assets/languages/zh_TW.ts b/linphone-desktop/assets/languages/zh_TW.ts similarity index 100% rename from assets/languages/zh_TW.ts rename to linphone-desktop/assets/languages/zh_TW.ts diff --git a/assets/linphone.desktop.cmake b/linphone-desktop/assets/linphone.desktop.cmake similarity index 100% rename from assets/linphone.desktop.cmake rename to linphone-desktop/assets/linphone.desktop.cmake diff --git a/assets/linphonerc-factory b/linphone-desktop/assets/linphonerc-factory similarity index 100% rename from assets/linphonerc-factory rename to linphone-desktop/assets/linphonerc-factory diff --git a/build/CMakeLists.txt b/linphone-desktop/build/CMakeLists.txt similarity index 100% rename from build/CMakeLists.txt rename to linphone-desktop/build/CMakeLists.txt diff --git a/build/rpm/linphone.spec.cmake b/linphone-desktop/build/rpm/linphone.spec.cmake similarity index 100% rename from build/rpm/linphone.spec.cmake rename to linphone-desktop/build/rpm/linphone.spec.cmake diff --git a/build/rpm/qt5.spec b/linphone-desktop/build/rpm/qt5.spec similarity index 100% rename from build/rpm/qt5.spec rename to linphone-desktop/build/rpm/qt5.spec diff --git a/cmake/FindMinizip.cmake b/linphone-desktop/cmake/FindMinizip.cmake similarity index 100% rename from cmake/FindMinizip.cmake rename to linphone-desktop/cmake/FindMinizip.cmake diff --git a/cmake_builder/CMakeLists.txt b/linphone-desktop/cmake_builder/CMakeLists.txt similarity index 100% rename from cmake_builder/CMakeLists.txt rename to linphone-desktop/cmake_builder/CMakeLists.txt diff --git a/cmake_builder/additional_steps.cmake b/linphone-desktop/cmake_builder/additional_steps.cmake similarity index 100% rename from cmake_builder/additional_steps.cmake rename to linphone-desktop/cmake_builder/additional_steps.cmake diff --git a/cmake_builder/install.cmake b/linphone-desktop/cmake_builder/install.cmake similarity index 100% rename from cmake_builder/install.cmake rename to linphone-desktop/cmake_builder/install.cmake diff --git a/cmake_builder/linphone_package/CMakeLists.txt b/linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt similarity index 100% rename from cmake_builder/linphone_package/CMakeLists.txt rename to linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt diff --git a/cmake_builder/linphone_package/macos/Info.plist.in b/linphone-desktop/cmake_builder/linphone_package/macos/Info.plist.in similarity index 100% rename from cmake_builder/linphone_package/macos/Info.plist.in rename to linphone-desktop/cmake_builder/linphone_package/macos/Info.plist.in diff --git a/cmake_builder/linphone_package/macos/background_dmg.jpg b/linphone-desktop/cmake_builder/linphone_package/macos/background_dmg.jpg similarity index 100% rename from cmake_builder/linphone_package/macos/background_dmg.jpg rename to linphone-desktop/cmake_builder/linphone_package/macos/background_dmg.jpg diff --git a/cmake_builder/linphone_package/macos/linphone.icns b/linphone-desktop/cmake_builder/linphone_package/macos/linphone.icns similarity index 100% rename from cmake_builder/linphone_package/macos/linphone.icns rename to linphone-desktop/cmake_builder/linphone_package/macos/linphone.icns diff --git a/cmake_builder/linphone_package/macos/linphone_dmg.scpt.in b/linphone-desktop/cmake_builder/linphone_package/macos/linphone_dmg.scpt.in similarity index 100% rename from cmake_builder/linphone_package/macos/linphone_dmg.scpt.in rename to linphone-desktop/cmake_builder/linphone_package/macos/linphone_dmg.scpt.in diff --git a/cmake_builder/linphone_package/macos/packaging.cmake.in b/linphone-desktop/cmake_builder/linphone_package/macos/packaging.cmake.in similarity index 100% rename from cmake_builder/linphone_package/macos/packaging.cmake.in rename to linphone-desktop/cmake_builder/linphone_package/macos/packaging.cmake.in diff --git a/cmake_builder/linphone_package/sdk_content/antlr3c.list.in b/linphone-desktop/cmake_builder/linphone_package/sdk_content/antlr3c.list.in similarity index 100% rename from cmake_builder/linphone_package/sdk_content/antlr3c.list.in rename to linphone-desktop/cmake_builder/linphone_package/sdk_content/antlr3c.list.in diff --git a/cmake_builder/linphone_package/sdk_content/bctoolbox.list.in b/linphone-desktop/cmake_builder/linphone_package/sdk_content/bctoolbox.list.in similarity index 100% rename from cmake_builder/linphone_package/sdk_content/bctoolbox.list.in rename to linphone-desktop/cmake_builder/linphone_package/sdk_content/bctoolbox.list.in diff --git a/cmake_builder/linphone_package/sdk_content/bcunit.list.in b/linphone-desktop/cmake_builder/linphone_package/sdk_content/bcunit.list.in similarity index 100% rename from cmake_builder/linphone_package/sdk_content/bcunit.list.in rename to linphone-desktop/cmake_builder/linphone_package/sdk_content/bcunit.list.in diff --git a/cmake_builder/linphone_package/sdk_content/bellesip.list.in b/linphone-desktop/cmake_builder/linphone_package/sdk_content/bellesip.list.in similarity index 100% rename from cmake_builder/linphone_package/sdk_content/bellesip.list.in rename to linphone-desktop/cmake_builder/linphone_package/sdk_content/bellesip.list.in diff --git a/cmake_builder/linphone_package/sdk_content/bv16.list.in b/linphone-desktop/cmake_builder/linphone_package/sdk_content/bv16.list.in similarity index 100% rename from cmake_builder/linphone_package/sdk_content/bv16.list.in rename to linphone-desktop/cmake_builder/linphone_package/sdk_content/bv16.list.in diff --git a/cmake_builder/linphone_package/sdk_content/bzrtp.list.in b/linphone-desktop/cmake_builder/linphone_package/sdk_content/bzrtp.list.in similarity index 100% rename from cmake_builder/linphone_package/sdk_content/bzrtp.list.in rename to linphone-desktop/cmake_builder/linphone_package/sdk_content/bzrtp.list.in diff --git a/cmake_builder/linphone_package/sdk_content/ffmpeg.list.in b/linphone-desktop/cmake_builder/linphone_package/sdk_content/ffmpeg.list.in similarity index 100% rename from cmake_builder/linphone_package/sdk_content/ffmpeg.list.in rename to linphone-desktop/cmake_builder/linphone_package/sdk_content/ffmpeg.list.in diff --git a/cmake_builder/linphone_package/sdk_content/gsm.list.in b/linphone-desktop/cmake_builder/linphone_package/sdk_content/gsm.list.in similarity index 100% rename from cmake_builder/linphone_package/sdk_content/gsm.list.in rename to linphone-desktop/cmake_builder/linphone_package/sdk_content/gsm.list.in diff --git a/cmake_builder/linphone_package/sdk_content/linphone.list.in b/linphone-desktop/cmake_builder/linphone_package/sdk_content/linphone.list.in similarity index 100% rename from cmake_builder/linphone_package/sdk_content/linphone.list.in rename to linphone-desktop/cmake_builder/linphone_package/sdk_content/linphone.list.in diff --git a/cmake_builder/linphone_package/sdk_content/linphonecxx.list.in b/linphone-desktop/cmake_builder/linphone_package/sdk_content/linphonecxx.list.in similarity index 100% rename from cmake_builder/linphone_package/sdk_content/linphonecxx.list.in rename to linphone-desktop/cmake_builder/linphone_package/sdk_content/linphonecxx.list.in diff --git a/cmake_builder/linphone_package/sdk_content/mbedtls.list.in b/linphone-desktop/cmake_builder/linphone_package/sdk_content/mbedtls.list.in similarity index 100% rename from cmake_builder/linphone_package/sdk_content/mbedtls.list.in rename to linphone-desktop/cmake_builder/linphone_package/sdk_content/mbedtls.list.in diff --git a/cmake_builder/linphone_package/sdk_content/ms2.list.in b/linphone-desktop/cmake_builder/linphone_package/sdk_content/ms2.list.in similarity index 100% rename from cmake_builder/linphone_package/sdk_content/ms2.list.in rename to linphone-desktop/cmake_builder/linphone_package/sdk_content/ms2.list.in diff --git a/cmake_builder/linphone_package/sdk_content/ms2plugins.list.in b/linphone-desktop/cmake_builder/linphone_package/sdk_content/ms2plugins.list.in similarity index 100% rename from cmake_builder/linphone_package/sdk_content/ms2plugins.list.in rename to linphone-desktop/cmake_builder/linphone_package/sdk_content/ms2plugins.list.in diff --git a/cmake_builder/linphone_package/sdk_content/opus.list.in b/linphone-desktop/cmake_builder/linphone_package/sdk_content/opus.list.in similarity index 100% rename from cmake_builder/linphone_package/sdk_content/opus.list.in rename to linphone-desktop/cmake_builder/linphone_package/sdk_content/opus.list.in diff --git a/cmake_builder/linphone_package/sdk_content/ortp.list.in b/linphone-desktop/cmake_builder/linphone_package/sdk_content/ortp.list.in similarity index 100% rename from cmake_builder/linphone_package/sdk_content/ortp.list.in rename to linphone-desktop/cmake_builder/linphone_package/sdk_content/ortp.list.in diff --git a/cmake_builder/linphone_package/sdk_content/polarssl.list.in b/linphone-desktop/cmake_builder/linphone_package/sdk_content/polarssl.list.in similarity index 100% rename from cmake_builder/linphone_package/sdk_content/polarssl.list.in rename to linphone-desktop/cmake_builder/linphone_package/sdk_content/polarssl.list.in diff --git a/cmake_builder/linphone_package/sdk_content/speex.list.in b/linphone-desktop/cmake_builder/linphone_package/sdk_content/speex.list.in similarity index 100% rename from cmake_builder/linphone_package/sdk_content/speex.list.in rename to linphone-desktop/cmake_builder/linphone_package/sdk_content/speex.list.in diff --git a/cmake_builder/linphone_package/sdk_content/sqlite3.list.in b/linphone-desktop/cmake_builder/linphone_package/sdk_content/sqlite3.list.in similarity index 100% rename from cmake_builder/linphone_package/sdk_content/sqlite3.list.in rename to linphone-desktop/cmake_builder/linphone_package/sdk_content/sqlite3.list.in diff --git a/cmake_builder/linphone_package/sdk_content/srtp.list.in b/linphone-desktop/cmake_builder/linphone_package/sdk_content/srtp.list.in similarity index 100% rename from cmake_builder/linphone_package/sdk_content/srtp.list.in rename to linphone-desktop/cmake_builder/linphone_package/sdk_content/srtp.list.in diff --git a/cmake_builder/linphone_package/sdk_content/vcard.list.in b/linphone-desktop/cmake_builder/linphone_package/sdk_content/vcard.list.in similarity index 100% rename from cmake_builder/linphone_package/sdk_content/vcard.list.in rename to linphone-desktop/cmake_builder/linphone_package/sdk_content/vcard.list.in diff --git a/cmake_builder/linphone_package/sdk_content/xml2.list.in b/linphone-desktop/cmake_builder/linphone_package/sdk_content/xml2.list.in similarity index 100% rename from cmake_builder/linphone_package/sdk_content/xml2.list.in rename to linphone-desktop/cmake_builder/linphone_package/sdk_content/xml2.list.in diff --git a/cmake_builder/linphone_package/sdk_content/zlib.list.in b/linphone-desktop/cmake_builder/linphone_package/sdk_content/zlib.list.in similarity index 100% rename from cmake_builder/linphone_package/sdk_content/zlib.list.in rename to linphone-desktop/cmake_builder/linphone_package/sdk_content/zlib.list.in diff --git a/cmake_builder/linphone_package/windows/NSIS.template.in b/linphone-desktop/cmake_builder/linphone_package/windows/NSIS.template.in similarity index 100% rename from cmake_builder/linphone_package/windows/NSIS.template.in rename to linphone-desktop/cmake_builder/linphone_package/windows/NSIS.template.in diff --git a/cmake_builder/linphone_package/windows/install.nsi.in b/linphone-desktop/cmake_builder/linphone_package/windows/install.nsi.in similarity index 100% rename from cmake_builder/linphone_package/windows/install.nsi.in rename to linphone-desktop/cmake_builder/linphone_package/windows/install.nsi.in diff --git a/cmake_builder/linphone_package/windows/nsis_banner.bmp b/linphone-desktop/cmake_builder/linphone_package/windows/nsis_banner.bmp similarity index 100% rename from cmake_builder/linphone_package/windows/nsis_banner.bmp rename to linphone-desktop/cmake_builder/linphone_package/windows/nsis_banner.bmp diff --git a/cmake_builder/linphone_package/windows/packaging.cmake.in b/linphone-desktop/cmake_builder/linphone_package/windows/packaging.cmake.in similarity index 100% rename from cmake_builder/linphone_package/windows/packaging.cmake.in rename to linphone-desktop/cmake_builder/linphone_package/windows/packaging.cmake.in diff --git a/cmake_builder/linphone_package/windows/signtool.py b/linphone-desktop/cmake_builder/linphone_package/windows/signtool.py similarity index 100% rename from cmake_builder/linphone_package/windows/signtool.py rename to linphone-desktop/cmake_builder/linphone_package/windows/signtool.py diff --git a/cmake_builder/linphone_package/windows/uninstall.nsi.in b/linphone-desktop/cmake_builder/linphone_package/windows/uninstall.nsi.in similarity index 100% rename from cmake_builder/linphone_package/windows/uninstall.nsi.in rename to linphone-desktop/cmake_builder/linphone_package/windows/uninstall.nsi.in diff --git a/cmake_builder/linphone_package/windows/winshortcut.vbs.in b/linphone-desktop/cmake_builder/linphone_package/windows/winshortcut.vbs.in similarity index 100% rename from cmake_builder/linphone_package/windows/winshortcut.vbs.in rename to linphone-desktop/cmake_builder/linphone_package/windows/winshortcut.vbs.in diff --git a/cmake_builder/linphoneqt.cmake b/linphone-desktop/cmake_builder/linphoneqt.cmake similarity index 100% rename from cmake_builder/linphoneqt.cmake rename to linphone-desktop/cmake_builder/linphoneqt.cmake diff --git a/resources.qrc b/linphone-desktop/resources.qrc similarity index 100% rename from resources.qrc rename to linphone-desktop/resources.qrc diff --git a/src/app/App.cpp b/linphone-desktop/src/app/App.cpp similarity index 100% rename from src/app/App.cpp rename to linphone-desktop/src/app/App.cpp diff --git a/src/app/App.hpp b/linphone-desktop/src/app/App.hpp similarity index 100% rename from src/app/App.hpp rename to linphone-desktop/src/app/App.hpp diff --git a/src/app/AppController.cpp b/linphone-desktop/src/app/AppController.cpp similarity index 100% rename from src/app/AppController.cpp rename to linphone-desktop/src/app/AppController.cpp diff --git a/src/app/AppController.hpp b/linphone-desktop/src/app/AppController.hpp similarity index 100% rename from src/app/AppController.hpp rename to linphone-desktop/src/app/AppController.hpp diff --git a/src/app/cli/Cli.cpp b/linphone-desktop/src/app/cli/Cli.cpp similarity index 100% rename from src/app/cli/Cli.cpp rename to linphone-desktop/src/app/cli/Cli.cpp diff --git a/src/app/cli/Cli.hpp b/linphone-desktop/src/app/cli/Cli.hpp similarity index 100% rename from src/app/cli/Cli.hpp rename to linphone-desktop/src/app/cli/Cli.hpp diff --git a/src/app/logger/Logger.cpp b/linphone-desktop/src/app/logger/Logger.cpp similarity index 100% rename from src/app/logger/Logger.cpp rename to linphone-desktop/src/app/logger/Logger.cpp diff --git a/src/app/logger/Logger.hpp b/linphone-desktop/src/app/logger/Logger.hpp similarity index 100% rename from src/app/logger/Logger.hpp rename to linphone-desktop/src/app/logger/Logger.hpp diff --git a/src/app/main.cpp b/linphone-desktop/src/app/main.cpp similarity index 100% rename from src/app/main.cpp rename to linphone-desktop/src/app/main.cpp diff --git a/src/app/paths/Paths.cpp b/linphone-desktop/src/app/paths/Paths.cpp similarity index 100% rename from src/app/paths/Paths.cpp rename to linphone-desktop/src/app/paths/Paths.cpp diff --git a/src/app/paths/Paths.hpp b/linphone-desktop/src/app/paths/Paths.hpp similarity index 100% rename from src/app/paths/Paths.hpp rename to linphone-desktop/src/app/paths/Paths.hpp diff --git a/src/app/providers/AvatarProvider.cpp b/linphone-desktop/src/app/providers/AvatarProvider.cpp similarity index 100% rename from src/app/providers/AvatarProvider.cpp rename to linphone-desktop/src/app/providers/AvatarProvider.cpp diff --git a/src/app/providers/AvatarProvider.hpp b/linphone-desktop/src/app/providers/AvatarProvider.hpp similarity index 100% rename from src/app/providers/AvatarProvider.hpp rename to linphone-desktop/src/app/providers/AvatarProvider.hpp diff --git a/src/app/providers/ImageProvider.cpp b/linphone-desktop/src/app/providers/ImageProvider.cpp similarity index 100% rename from src/app/providers/ImageProvider.cpp rename to linphone-desktop/src/app/providers/ImageProvider.cpp diff --git a/src/app/providers/ImageProvider.hpp b/linphone-desktop/src/app/providers/ImageProvider.hpp similarity index 100% rename from src/app/providers/ImageProvider.hpp rename to linphone-desktop/src/app/providers/ImageProvider.hpp diff --git a/src/app/providers/ThumbnailProvider.cpp b/linphone-desktop/src/app/providers/ThumbnailProvider.cpp similarity index 100% rename from src/app/providers/ThumbnailProvider.cpp rename to linphone-desktop/src/app/providers/ThumbnailProvider.cpp diff --git a/src/app/providers/ThumbnailProvider.hpp b/linphone-desktop/src/app/providers/ThumbnailProvider.hpp similarity index 100% rename from src/app/providers/ThumbnailProvider.hpp rename to linphone-desktop/src/app/providers/ThumbnailProvider.hpp diff --git a/src/app/single-application/SingleApplication.cpp b/linphone-desktop/src/app/single-application/SingleApplication.cpp similarity index 100% rename from src/app/single-application/SingleApplication.cpp rename to linphone-desktop/src/app/single-application/SingleApplication.cpp diff --git a/src/app/single-application/SingleApplication.hpp b/linphone-desktop/src/app/single-application/SingleApplication.hpp similarity index 100% rename from src/app/single-application/SingleApplication.hpp rename to linphone-desktop/src/app/single-application/SingleApplication.hpp diff --git a/src/app/single-application/SingleApplicationDBus.cpp b/linphone-desktop/src/app/single-application/SingleApplicationDBus.cpp similarity index 100% rename from src/app/single-application/SingleApplicationDBus.cpp rename to linphone-desktop/src/app/single-application/SingleApplicationDBus.cpp diff --git a/src/app/single-application/SingleApplicationDBusPrivate.hpp b/linphone-desktop/src/app/single-application/SingleApplicationDBusPrivate.hpp similarity index 100% rename from src/app/single-application/SingleApplicationDBusPrivate.hpp rename to linphone-desktop/src/app/single-application/SingleApplicationDBusPrivate.hpp diff --git a/src/app/single-application/SingleApplicationPrivate.hpp b/linphone-desktop/src/app/single-application/SingleApplicationPrivate.hpp similarity index 100% rename from src/app/single-application/SingleApplicationPrivate.hpp rename to linphone-desktop/src/app/single-application/SingleApplicationPrivate.hpp diff --git a/src/app/translator/DefaultTranslator.cpp b/linphone-desktop/src/app/translator/DefaultTranslator.cpp similarity index 100% rename from src/app/translator/DefaultTranslator.cpp rename to linphone-desktop/src/app/translator/DefaultTranslator.cpp diff --git a/src/app/translator/DefaultTranslator.hpp b/linphone-desktop/src/app/translator/DefaultTranslator.hpp similarity index 100% rename from src/app/translator/DefaultTranslator.hpp rename to linphone-desktop/src/app/translator/DefaultTranslator.hpp diff --git a/src/components/Components.hpp b/linphone-desktop/src/components/Components.hpp similarity index 100% rename from src/components/Components.hpp rename to linphone-desktop/src/components/Components.hpp diff --git a/src/components/assistant/AssistantModel.cpp b/linphone-desktop/src/components/assistant/AssistantModel.cpp similarity index 100% rename from src/components/assistant/AssistantModel.cpp rename to linphone-desktop/src/components/assistant/AssistantModel.cpp diff --git a/src/components/assistant/AssistantModel.hpp b/linphone-desktop/src/components/assistant/AssistantModel.hpp similarity index 100% rename from src/components/assistant/AssistantModel.hpp rename to linphone-desktop/src/components/assistant/AssistantModel.hpp diff --git a/src/components/authentication/AuthenticationNotifier.cpp b/linphone-desktop/src/components/authentication/AuthenticationNotifier.cpp similarity index 100% rename from src/components/authentication/AuthenticationNotifier.cpp rename to linphone-desktop/src/components/authentication/AuthenticationNotifier.cpp diff --git a/src/components/authentication/AuthenticationNotifier.hpp b/linphone-desktop/src/components/authentication/AuthenticationNotifier.hpp similarity index 100% rename from src/components/authentication/AuthenticationNotifier.hpp rename to linphone-desktop/src/components/authentication/AuthenticationNotifier.hpp diff --git a/src/components/call/CallModel.cpp b/linphone-desktop/src/components/call/CallModel.cpp similarity index 100% rename from src/components/call/CallModel.cpp rename to linphone-desktop/src/components/call/CallModel.cpp diff --git a/src/components/call/CallModel.hpp b/linphone-desktop/src/components/call/CallModel.hpp similarity index 100% rename from src/components/call/CallModel.hpp rename to linphone-desktop/src/components/call/CallModel.hpp diff --git a/src/components/calls/CallsListModel.cpp b/linphone-desktop/src/components/calls/CallsListModel.cpp similarity index 100% rename from src/components/calls/CallsListModel.cpp rename to linphone-desktop/src/components/calls/CallsListModel.cpp diff --git a/src/components/calls/CallsListModel.hpp b/linphone-desktop/src/components/calls/CallsListModel.hpp similarity index 100% rename from src/components/calls/CallsListModel.hpp rename to linphone-desktop/src/components/calls/CallsListModel.hpp diff --git a/src/components/calls/CallsListProxyModel.cpp b/linphone-desktop/src/components/calls/CallsListProxyModel.cpp similarity index 100% rename from src/components/calls/CallsListProxyModel.cpp rename to linphone-desktop/src/components/calls/CallsListProxyModel.cpp diff --git a/src/components/calls/CallsListProxyModel.hpp b/linphone-desktop/src/components/calls/CallsListProxyModel.hpp similarity index 100% rename from src/components/calls/CallsListProxyModel.hpp rename to linphone-desktop/src/components/calls/CallsListProxyModel.hpp diff --git a/src/components/camera/Camera.cpp b/linphone-desktop/src/components/camera/Camera.cpp similarity index 100% rename from src/components/camera/Camera.cpp rename to linphone-desktop/src/components/camera/Camera.cpp diff --git a/src/components/camera/Camera.hpp b/linphone-desktop/src/components/camera/Camera.hpp similarity index 100% rename from src/components/camera/Camera.hpp rename to linphone-desktop/src/components/camera/Camera.hpp diff --git a/src/components/camera/CameraPreview.cpp b/linphone-desktop/src/components/camera/CameraPreview.cpp similarity index 100% rename from src/components/camera/CameraPreview.cpp rename to linphone-desktop/src/components/camera/CameraPreview.cpp diff --git a/src/components/camera/CameraPreview.hpp b/linphone-desktop/src/components/camera/CameraPreview.hpp similarity index 100% rename from src/components/camera/CameraPreview.hpp rename to linphone-desktop/src/components/camera/CameraPreview.hpp diff --git a/src/components/camera/MSFunctions.cpp b/linphone-desktop/src/components/camera/MSFunctions.cpp similarity index 100% rename from src/components/camera/MSFunctions.cpp rename to linphone-desktop/src/components/camera/MSFunctions.cpp diff --git a/src/components/camera/MSFunctions.hpp b/linphone-desktop/src/components/camera/MSFunctions.hpp similarity index 100% rename from src/components/camera/MSFunctions.hpp rename to linphone-desktop/src/components/camera/MSFunctions.hpp diff --git a/src/components/chat/ChatModel.cpp b/linphone-desktop/src/components/chat/ChatModel.cpp similarity index 100% rename from src/components/chat/ChatModel.cpp rename to linphone-desktop/src/components/chat/ChatModel.cpp diff --git a/src/components/chat/ChatModel.hpp b/linphone-desktop/src/components/chat/ChatModel.hpp similarity index 100% rename from src/components/chat/ChatModel.hpp rename to linphone-desktop/src/components/chat/ChatModel.hpp diff --git a/src/components/chat/ChatProxyModel.cpp b/linphone-desktop/src/components/chat/ChatProxyModel.cpp similarity index 100% rename from src/components/chat/ChatProxyModel.cpp rename to linphone-desktop/src/components/chat/ChatProxyModel.cpp diff --git a/src/components/chat/ChatProxyModel.hpp b/linphone-desktop/src/components/chat/ChatProxyModel.hpp similarity index 100% rename from src/components/chat/ChatProxyModel.hpp rename to linphone-desktop/src/components/chat/ChatProxyModel.hpp diff --git a/src/components/codecs/AbstractCodecsModel.cpp b/linphone-desktop/src/components/codecs/AbstractCodecsModel.cpp similarity index 100% rename from src/components/codecs/AbstractCodecsModel.cpp rename to linphone-desktop/src/components/codecs/AbstractCodecsModel.cpp diff --git a/src/components/codecs/AbstractCodecsModel.hpp b/linphone-desktop/src/components/codecs/AbstractCodecsModel.hpp similarity index 100% rename from src/components/codecs/AbstractCodecsModel.hpp rename to linphone-desktop/src/components/codecs/AbstractCodecsModel.hpp diff --git a/src/components/codecs/AudioCodecsModel.cpp b/linphone-desktop/src/components/codecs/AudioCodecsModel.cpp similarity index 100% rename from src/components/codecs/AudioCodecsModel.cpp rename to linphone-desktop/src/components/codecs/AudioCodecsModel.cpp diff --git a/src/components/codecs/AudioCodecsModel.hpp b/linphone-desktop/src/components/codecs/AudioCodecsModel.hpp similarity index 100% rename from src/components/codecs/AudioCodecsModel.hpp rename to linphone-desktop/src/components/codecs/AudioCodecsModel.hpp diff --git a/src/components/codecs/VideoCodecsModel.cpp b/linphone-desktop/src/components/codecs/VideoCodecsModel.cpp similarity index 100% rename from src/components/codecs/VideoCodecsModel.cpp rename to linphone-desktop/src/components/codecs/VideoCodecsModel.cpp diff --git a/src/components/codecs/VideoCodecsModel.hpp b/linphone-desktop/src/components/codecs/VideoCodecsModel.hpp similarity index 100% rename from src/components/codecs/VideoCodecsModel.hpp rename to linphone-desktop/src/components/codecs/VideoCodecsModel.hpp diff --git a/src/components/conference/ConferenceAddModel.cpp b/linphone-desktop/src/components/conference/ConferenceAddModel.cpp similarity index 100% rename from src/components/conference/ConferenceAddModel.cpp rename to linphone-desktop/src/components/conference/ConferenceAddModel.cpp diff --git a/src/components/conference/ConferenceAddModel.hpp b/linphone-desktop/src/components/conference/ConferenceAddModel.hpp similarity index 100% rename from src/components/conference/ConferenceAddModel.hpp rename to linphone-desktop/src/components/conference/ConferenceAddModel.hpp diff --git a/src/components/conference/ConferenceHelperModel.cpp b/linphone-desktop/src/components/conference/ConferenceHelperModel.cpp similarity index 100% rename from src/components/conference/ConferenceHelperModel.cpp rename to linphone-desktop/src/components/conference/ConferenceHelperModel.cpp diff --git a/src/components/conference/ConferenceHelperModel.hpp b/linphone-desktop/src/components/conference/ConferenceHelperModel.hpp similarity index 100% rename from src/components/conference/ConferenceHelperModel.hpp rename to linphone-desktop/src/components/conference/ConferenceHelperModel.hpp diff --git a/src/components/conference/ConferenceModel.cpp b/linphone-desktop/src/components/conference/ConferenceModel.cpp similarity index 100% rename from src/components/conference/ConferenceModel.cpp rename to linphone-desktop/src/components/conference/ConferenceModel.cpp diff --git a/src/components/conference/ConferenceModel.hpp b/linphone-desktop/src/components/conference/ConferenceModel.hpp similarity index 100% rename from src/components/conference/ConferenceModel.hpp rename to linphone-desktop/src/components/conference/ConferenceModel.hpp diff --git a/src/components/contact/ContactModel.cpp b/linphone-desktop/src/components/contact/ContactModel.cpp similarity index 100% rename from src/components/contact/ContactModel.cpp rename to linphone-desktop/src/components/contact/ContactModel.cpp diff --git a/src/components/contact/ContactModel.hpp b/linphone-desktop/src/components/contact/ContactModel.hpp similarity index 100% rename from src/components/contact/ContactModel.hpp rename to linphone-desktop/src/components/contact/ContactModel.hpp diff --git a/src/components/contact/VcardModel.cpp b/linphone-desktop/src/components/contact/VcardModel.cpp similarity index 100% rename from src/components/contact/VcardModel.cpp rename to linphone-desktop/src/components/contact/VcardModel.cpp diff --git a/src/components/contact/VcardModel.hpp b/linphone-desktop/src/components/contact/VcardModel.hpp similarity index 100% rename from src/components/contact/VcardModel.hpp rename to linphone-desktop/src/components/contact/VcardModel.hpp diff --git a/src/components/contacts/ContactsListModel.cpp b/linphone-desktop/src/components/contacts/ContactsListModel.cpp similarity index 100% rename from src/components/contacts/ContactsListModel.cpp rename to linphone-desktop/src/components/contacts/ContactsListModel.cpp diff --git a/src/components/contacts/ContactsListModel.hpp b/linphone-desktop/src/components/contacts/ContactsListModel.hpp similarity index 100% rename from src/components/contacts/ContactsListModel.hpp rename to linphone-desktop/src/components/contacts/ContactsListModel.hpp diff --git a/src/components/contacts/ContactsListProxyModel.cpp b/linphone-desktop/src/components/contacts/ContactsListProxyModel.cpp similarity index 100% rename from src/components/contacts/ContactsListProxyModel.cpp rename to linphone-desktop/src/components/contacts/ContactsListProxyModel.cpp diff --git a/src/components/contacts/ContactsListProxyModel.hpp b/linphone-desktop/src/components/contacts/ContactsListProxyModel.hpp similarity index 100% rename from src/components/contacts/ContactsListProxyModel.hpp rename to linphone-desktop/src/components/contacts/ContactsListProxyModel.hpp diff --git a/src/components/core/CoreHandlers.cpp b/linphone-desktop/src/components/core/CoreHandlers.cpp similarity index 100% rename from src/components/core/CoreHandlers.cpp rename to linphone-desktop/src/components/core/CoreHandlers.cpp diff --git a/src/components/core/CoreHandlers.hpp b/linphone-desktop/src/components/core/CoreHandlers.hpp similarity index 100% rename from src/components/core/CoreHandlers.hpp rename to linphone-desktop/src/components/core/CoreHandlers.hpp diff --git a/src/components/core/CoreManager.cpp b/linphone-desktop/src/components/core/CoreManager.cpp similarity index 100% rename from src/components/core/CoreManager.cpp rename to linphone-desktop/src/components/core/CoreManager.cpp diff --git a/src/components/core/CoreManager.hpp b/linphone-desktop/src/components/core/CoreManager.hpp similarity index 100% rename from src/components/core/CoreManager.hpp rename to linphone-desktop/src/components/core/CoreManager.hpp diff --git a/src/components/core/event-count-notifier/AbstractEventCountNotifier.cpp b/linphone-desktop/src/components/core/event-count-notifier/AbstractEventCountNotifier.cpp similarity index 100% rename from src/components/core/event-count-notifier/AbstractEventCountNotifier.cpp rename to linphone-desktop/src/components/core/event-count-notifier/AbstractEventCountNotifier.cpp diff --git a/src/components/core/event-count-notifier/AbstractEventCountNotifier.hpp b/linphone-desktop/src/components/core/event-count-notifier/AbstractEventCountNotifier.hpp similarity index 100% rename from src/components/core/event-count-notifier/AbstractEventCountNotifier.hpp rename to linphone-desktop/src/components/core/event-count-notifier/AbstractEventCountNotifier.hpp diff --git a/src/components/core/event-count-notifier/EventCountNotifierMacOs.hpp b/linphone-desktop/src/components/core/event-count-notifier/EventCountNotifierMacOs.hpp similarity index 100% rename from src/components/core/event-count-notifier/EventCountNotifierMacOs.hpp rename to linphone-desktop/src/components/core/event-count-notifier/EventCountNotifierMacOs.hpp diff --git a/src/components/core/event-count-notifier/EventCountNotifierMacOs.m b/linphone-desktop/src/components/core/event-count-notifier/EventCountNotifierMacOs.m similarity index 100% rename from src/components/core/event-count-notifier/EventCountNotifierMacOs.m rename to linphone-desktop/src/components/core/event-count-notifier/EventCountNotifierMacOs.m diff --git a/src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.cpp b/linphone-desktop/src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.cpp similarity index 100% rename from src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.cpp rename to linphone-desktop/src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.cpp diff --git a/src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.hpp b/linphone-desktop/src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.hpp similarity index 100% rename from src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.hpp rename to linphone-desktop/src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.hpp diff --git a/src/components/file/FileDownloader.cpp b/linphone-desktop/src/components/file/FileDownloader.cpp similarity index 100% rename from src/components/file/FileDownloader.cpp rename to linphone-desktop/src/components/file/FileDownloader.cpp diff --git a/src/components/file/FileDownloader.hpp b/linphone-desktop/src/components/file/FileDownloader.hpp similarity index 100% rename from src/components/file/FileDownloader.hpp rename to linphone-desktop/src/components/file/FileDownloader.hpp diff --git a/src/components/file/FileExtractor.cpp b/linphone-desktop/src/components/file/FileExtractor.cpp similarity index 100% rename from src/components/file/FileExtractor.cpp rename to linphone-desktop/src/components/file/FileExtractor.cpp diff --git a/src/components/file/FileExtractor.hpp b/linphone-desktop/src/components/file/FileExtractor.hpp similarity index 100% rename from src/components/file/FileExtractor.hpp rename to linphone-desktop/src/components/file/FileExtractor.hpp diff --git a/src/components/notifier/Notifier.cpp b/linphone-desktop/src/components/notifier/Notifier.cpp similarity index 100% rename from src/components/notifier/Notifier.cpp rename to linphone-desktop/src/components/notifier/Notifier.cpp diff --git a/src/components/notifier/Notifier.hpp b/linphone-desktop/src/components/notifier/Notifier.hpp similarity index 100% rename from src/components/notifier/Notifier.hpp rename to linphone-desktop/src/components/notifier/Notifier.hpp diff --git a/src/components/other/clipboard/Clipboard.cpp b/linphone-desktop/src/components/other/clipboard/Clipboard.cpp similarity index 100% rename from src/components/other/clipboard/Clipboard.cpp rename to linphone-desktop/src/components/other/clipboard/Clipboard.cpp diff --git a/src/components/other/clipboard/Clipboard.hpp b/linphone-desktop/src/components/other/clipboard/Clipboard.hpp similarity index 100% rename from src/components/other/clipboard/Clipboard.hpp rename to linphone-desktop/src/components/other/clipboard/Clipboard.hpp diff --git a/src/components/other/colors/Colors.cpp b/linphone-desktop/src/components/other/colors/Colors.cpp similarity index 100% rename from src/components/other/colors/Colors.cpp rename to linphone-desktop/src/components/other/colors/Colors.cpp diff --git a/src/components/other/colors/Colors.hpp b/linphone-desktop/src/components/other/colors/Colors.hpp similarity index 100% rename from src/components/other/colors/Colors.hpp rename to linphone-desktop/src/components/other/colors/Colors.hpp diff --git a/src/components/other/desktop-tools/DesktopTools.hpp b/linphone-desktop/src/components/other/desktop-tools/DesktopTools.hpp similarity index 100% rename from src/components/other/desktop-tools/DesktopTools.hpp rename to linphone-desktop/src/components/other/desktop-tools/DesktopTools.hpp diff --git a/src/components/other/desktop-tools/DesktopToolsLinux.cpp b/linphone-desktop/src/components/other/desktop-tools/DesktopToolsLinux.cpp similarity index 100% rename from src/components/other/desktop-tools/DesktopToolsLinux.cpp rename to linphone-desktop/src/components/other/desktop-tools/DesktopToolsLinux.cpp diff --git a/src/components/other/desktop-tools/DesktopToolsLinux.hpp b/linphone-desktop/src/components/other/desktop-tools/DesktopToolsLinux.hpp similarity index 100% rename from src/components/other/desktop-tools/DesktopToolsLinux.hpp rename to linphone-desktop/src/components/other/desktop-tools/DesktopToolsLinux.hpp diff --git a/src/components/other/desktop-tools/DesktopToolsMacOs.cpp b/linphone-desktop/src/components/other/desktop-tools/DesktopToolsMacOs.cpp similarity index 100% rename from src/components/other/desktop-tools/DesktopToolsMacOs.cpp rename to linphone-desktop/src/components/other/desktop-tools/DesktopToolsMacOs.cpp diff --git a/src/components/other/desktop-tools/DesktopToolsMacOs.hpp b/linphone-desktop/src/components/other/desktop-tools/DesktopToolsMacOs.hpp similarity index 100% rename from src/components/other/desktop-tools/DesktopToolsMacOs.hpp rename to linphone-desktop/src/components/other/desktop-tools/DesktopToolsMacOs.hpp diff --git a/src/components/other/desktop-tools/DesktopToolsWindows.cpp b/linphone-desktop/src/components/other/desktop-tools/DesktopToolsWindows.cpp similarity index 100% rename from src/components/other/desktop-tools/DesktopToolsWindows.cpp rename to linphone-desktop/src/components/other/desktop-tools/DesktopToolsWindows.cpp diff --git a/src/components/other/desktop-tools/DesktopToolsWindows.hpp b/linphone-desktop/src/components/other/desktop-tools/DesktopToolsWindows.hpp similarity index 100% rename from src/components/other/desktop-tools/DesktopToolsWindows.hpp rename to linphone-desktop/src/components/other/desktop-tools/DesktopToolsWindows.hpp diff --git a/src/components/other/desktop-tools/screen-saver/ScreenSaverDBus.cpp b/linphone-desktop/src/components/other/desktop-tools/screen-saver/ScreenSaverDBus.cpp similarity index 100% rename from src/components/other/desktop-tools/screen-saver/ScreenSaverDBus.cpp rename to linphone-desktop/src/components/other/desktop-tools/screen-saver/ScreenSaverDBus.cpp diff --git a/src/components/other/desktop-tools/screen-saver/ScreenSaverDBus.hpp b/linphone-desktop/src/components/other/desktop-tools/screen-saver/ScreenSaverDBus.hpp similarity index 100% rename from src/components/other/desktop-tools/screen-saver/ScreenSaverDBus.hpp rename to linphone-desktop/src/components/other/desktop-tools/screen-saver/ScreenSaverDBus.hpp diff --git a/src/components/other/desktop-tools/screen-saver/ScreenSaverMacOs.m b/linphone-desktop/src/components/other/desktop-tools/screen-saver/ScreenSaverMacOs.m similarity index 100% rename from src/components/other/desktop-tools/screen-saver/ScreenSaverMacOs.m rename to linphone-desktop/src/components/other/desktop-tools/screen-saver/ScreenSaverMacOs.m diff --git a/src/components/other/desktop-tools/screen-saver/ScreenSaverXdg.cpp b/linphone-desktop/src/components/other/desktop-tools/screen-saver/ScreenSaverXdg.cpp similarity index 100% rename from src/components/other/desktop-tools/screen-saver/ScreenSaverXdg.cpp rename to linphone-desktop/src/components/other/desktop-tools/screen-saver/ScreenSaverXdg.cpp diff --git a/src/components/other/desktop-tools/screen-saver/ScreenSaverXdg.hpp b/linphone-desktop/src/components/other/desktop-tools/screen-saver/ScreenSaverXdg.hpp similarity index 100% rename from src/components/other/desktop-tools/screen-saver/ScreenSaverXdg.hpp rename to linphone-desktop/src/components/other/desktop-tools/screen-saver/ScreenSaverXdg.hpp diff --git a/src/components/other/desktop-tools/state-process/StateProcessMacOs.mm b/linphone-desktop/src/components/other/desktop-tools/state-process/StateProcessMacOs.mm similarity index 100% rename from src/components/other/desktop-tools/state-process/StateProcessMacOs.mm rename to linphone-desktop/src/components/other/desktop-tools/state-process/StateProcessMacOs.mm diff --git a/src/components/other/text-to-speech/TextToSpeech.cpp b/linphone-desktop/src/components/other/text-to-speech/TextToSpeech.cpp similarity index 100% rename from src/components/other/text-to-speech/TextToSpeech.cpp rename to linphone-desktop/src/components/other/text-to-speech/TextToSpeech.cpp diff --git a/src/components/other/text-to-speech/TextToSpeech.hpp b/linphone-desktop/src/components/other/text-to-speech/TextToSpeech.hpp similarity index 100% rename from src/components/other/text-to-speech/TextToSpeech.hpp rename to linphone-desktop/src/components/other/text-to-speech/TextToSpeech.hpp diff --git a/src/components/other/units/Units.cpp b/linphone-desktop/src/components/other/units/Units.cpp similarity index 100% rename from src/components/other/units/Units.cpp rename to linphone-desktop/src/components/other/units/Units.cpp diff --git a/src/components/other/units/Units.hpp b/linphone-desktop/src/components/other/units/Units.hpp similarity index 100% rename from src/components/other/units/Units.hpp rename to linphone-desktop/src/components/other/units/Units.hpp diff --git a/src/components/presence/OwnPresenceModel.cpp b/linphone-desktop/src/components/presence/OwnPresenceModel.cpp similarity index 100% rename from src/components/presence/OwnPresenceModel.cpp rename to linphone-desktop/src/components/presence/OwnPresenceModel.cpp diff --git a/src/components/presence/OwnPresenceModel.hpp b/linphone-desktop/src/components/presence/OwnPresenceModel.hpp similarity index 100% rename from src/components/presence/OwnPresenceModel.hpp rename to linphone-desktop/src/components/presence/OwnPresenceModel.hpp diff --git a/src/components/presence/Presence.cpp b/linphone-desktop/src/components/presence/Presence.cpp similarity index 100% rename from src/components/presence/Presence.cpp rename to linphone-desktop/src/components/presence/Presence.cpp diff --git a/src/components/presence/Presence.hpp b/linphone-desktop/src/components/presence/Presence.hpp similarity index 100% rename from src/components/presence/Presence.hpp rename to linphone-desktop/src/components/presence/Presence.hpp diff --git a/src/components/settings/AccountSettingsModel.cpp b/linphone-desktop/src/components/settings/AccountSettingsModel.cpp similarity index 100% rename from src/components/settings/AccountSettingsModel.cpp rename to linphone-desktop/src/components/settings/AccountSettingsModel.cpp diff --git a/src/components/settings/AccountSettingsModel.hpp b/linphone-desktop/src/components/settings/AccountSettingsModel.hpp similarity index 100% rename from src/components/settings/AccountSettingsModel.hpp rename to linphone-desktop/src/components/settings/AccountSettingsModel.hpp diff --git a/src/components/settings/SettingsModel.cpp b/linphone-desktop/src/components/settings/SettingsModel.cpp similarity index 100% rename from src/components/settings/SettingsModel.cpp rename to linphone-desktop/src/components/settings/SettingsModel.cpp diff --git a/src/components/settings/SettingsModel.hpp b/linphone-desktop/src/components/settings/SettingsModel.hpp similarity index 100% rename from src/components/settings/SettingsModel.hpp rename to linphone-desktop/src/components/settings/SettingsModel.hpp diff --git a/src/components/sip-addresses/SipAddressObserver.cpp b/linphone-desktop/src/components/sip-addresses/SipAddressObserver.cpp similarity index 100% rename from src/components/sip-addresses/SipAddressObserver.cpp rename to linphone-desktop/src/components/sip-addresses/SipAddressObserver.cpp diff --git a/src/components/sip-addresses/SipAddressObserver.hpp b/linphone-desktop/src/components/sip-addresses/SipAddressObserver.hpp similarity index 100% rename from src/components/sip-addresses/SipAddressObserver.hpp rename to linphone-desktop/src/components/sip-addresses/SipAddressObserver.hpp diff --git a/src/components/sip-addresses/SipAddressesModel.cpp b/linphone-desktop/src/components/sip-addresses/SipAddressesModel.cpp similarity index 100% rename from src/components/sip-addresses/SipAddressesModel.cpp rename to linphone-desktop/src/components/sip-addresses/SipAddressesModel.cpp diff --git a/src/components/sip-addresses/SipAddressesModel.hpp b/linphone-desktop/src/components/sip-addresses/SipAddressesModel.hpp similarity index 100% rename from src/components/sip-addresses/SipAddressesModel.hpp rename to linphone-desktop/src/components/sip-addresses/SipAddressesModel.hpp diff --git a/src/components/sip-addresses/SipAddressesProxyModel.cpp b/linphone-desktop/src/components/sip-addresses/SipAddressesProxyModel.cpp similarity index 100% rename from src/components/sip-addresses/SipAddressesProxyModel.cpp rename to linphone-desktop/src/components/sip-addresses/SipAddressesProxyModel.cpp diff --git a/src/components/sip-addresses/SipAddressesProxyModel.hpp b/linphone-desktop/src/components/sip-addresses/SipAddressesProxyModel.hpp similarity index 100% rename from src/components/sip-addresses/SipAddressesProxyModel.hpp rename to linphone-desktop/src/components/sip-addresses/SipAddressesProxyModel.hpp diff --git a/src/components/sound-player/SoundPlayer.cpp b/linphone-desktop/src/components/sound-player/SoundPlayer.cpp similarity index 100% rename from src/components/sound-player/SoundPlayer.cpp rename to linphone-desktop/src/components/sound-player/SoundPlayer.cpp diff --git a/src/components/sound-player/SoundPlayer.hpp b/linphone-desktop/src/components/sound-player/SoundPlayer.hpp similarity index 100% rename from src/components/sound-player/SoundPlayer.hpp rename to linphone-desktop/src/components/sound-player/SoundPlayer.hpp diff --git a/src/components/telephone-numbers/TelephoneNumbersModel.cpp b/linphone-desktop/src/components/telephone-numbers/TelephoneNumbersModel.cpp similarity index 100% rename from src/components/telephone-numbers/TelephoneNumbersModel.cpp rename to linphone-desktop/src/components/telephone-numbers/TelephoneNumbersModel.cpp diff --git a/src/components/telephone-numbers/TelephoneNumbersModel.hpp b/linphone-desktop/src/components/telephone-numbers/TelephoneNumbersModel.hpp similarity index 100% rename from src/components/telephone-numbers/TelephoneNumbersModel.hpp rename to linphone-desktop/src/components/telephone-numbers/TelephoneNumbersModel.hpp diff --git a/src/components/timeline/TimelineModel.cpp b/linphone-desktop/src/components/timeline/TimelineModel.cpp similarity index 100% rename from src/components/timeline/TimelineModel.cpp rename to linphone-desktop/src/components/timeline/TimelineModel.cpp diff --git a/src/components/timeline/TimelineModel.hpp b/linphone-desktop/src/components/timeline/TimelineModel.hpp similarity index 100% rename from src/components/timeline/TimelineModel.hpp rename to linphone-desktop/src/components/timeline/TimelineModel.hpp diff --git a/src/components/url-handlers/UrlHandlers.cpp b/linphone-desktop/src/components/url-handlers/UrlHandlers.cpp similarity index 100% rename from src/components/url-handlers/UrlHandlers.cpp rename to linphone-desktop/src/components/url-handlers/UrlHandlers.cpp diff --git a/src/components/url-handlers/UrlHandlers.hpp b/linphone-desktop/src/components/url-handlers/UrlHandlers.hpp similarity index 100% rename from src/components/url-handlers/UrlHandlers.hpp rename to linphone-desktop/src/components/url-handlers/UrlHandlers.hpp diff --git a/src/config.h.cmake b/linphone-desktop/src/config.h.cmake similarity index 100% rename from src/config.h.cmake rename to linphone-desktop/src/config.h.cmake diff --git a/src/utils/LinphoneUtils.cpp b/linphone-desktop/src/utils/LinphoneUtils.cpp similarity index 100% rename from src/utils/LinphoneUtils.cpp rename to linphone-desktop/src/utils/LinphoneUtils.cpp diff --git a/src/utils/LinphoneUtils.hpp b/linphone-desktop/src/utils/LinphoneUtils.hpp similarity index 100% rename from src/utils/LinphoneUtils.hpp rename to linphone-desktop/src/utils/LinphoneUtils.hpp diff --git a/src/utils/MediastreamerUtils.cpp b/linphone-desktop/src/utils/MediastreamerUtils.cpp similarity index 100% rename from src/utils/MediastreamerUtils.cpp rename to linphone-desktop/src/utils/MediastreamerUtils.cpp diff --git a/src/utils/MediastreamerUtils.hpp b/linphone-desktop/src/utils/MediastreamerUtils.hpp similarity index 100% rename from src/utils/MediastreamerUtils.hpp rename to linphone-desktop/src/utils/MediastreamerUtils.hpp diff --git a/src/utils/QExifImageHeader.cpp b/linphone-desktop/src/utils/QExifImageHeader.cpp similarity index 100% rename from src/utils/QExifImageHeader.cpp rename to linphone-desktop/src/utils/QExifImageHeader.cpp diff --git a/src/utils/QExifImageHeader.hpp b/linphone-desktop/src/utils/QExifImageHeader.hpp similarity index 100% rename from src/utils/QExifImageHeader.hpp rename to linphone-desktop/src/utils/QExifImageHeader.hpp diff --git a/src/utils/Utils.cpp b/linphone-desktop/src/utils/Utils.cpp similarity index 100% rename from src/utils/Utils.cpp rename to linphone-desktop/src/utils/Utils.cpp diff --git a/src/utils/Utils.hpp b/linphone-desktop/src/utils/Utils.hpp similarity index 100% rename from src/utils/Utils.hpp rename to linphone-desktop/src/utils/Utils.hpp diff --git a/tools/build_qt_rpm b/linphone-desktop/tools/build_qt_rpm similarity index 100% rename from tools/build_qt_rpm rename to linphone-desktop/tools/build_qt_rpm diff --git a/tools/check_qml_syntax b/linphone-desktop/tools/check_qml_syntax similarity index 100% rename from tools/check_qml_syntax rename to linphone-desktop/tools/check_qml_syntax diff --git a/tools/private/pre-commit b/linphone-desktop/tools/private/pre-commit similarity index 100% rename from tools/private/pre-commit rename to linphone-desktop/tools/private/pre-commit diff --git a/tools/test_qml b/linphone-desktop/tools/test_qml similarity index 100% rename from tools/test_qml rename to linphone-desktop/tools/test_qml diff --git a/tools/update_resources b/linphone-desktop/tools/update_resources similarity index 100% rename from tools/update_resources rename to linphone-desktop/tools/update_resources diff --git a/ui/dev-modules/Colors/Colors.qml b/linphone-desktop/ui/dev-modules/Colors/Colors.qml similarity index 100% rename from ui/dev-modules/Colors/Colors.qml rename to linphone-desktop/ui/dev-modules/Colors/Colors.qml diff --git a/ui/dev-modules/Colors/qmldir b/linphone-desktop/ui/dev-modules/Colors/qmldir similarity index 100% rename from ui/dev-modules/Colors/qmldir rename to linphone-desktop/ui/dev-modules/Colors/qmldir diff --git a/ui/dev-modules/Units/Units.qml b/linphone-desktop/ui/dev-modules/Units/Units.qml similarity index 100% rename from ui/dev-modules/Units/Units.qml rename to linphone-desktop/ui/dev-modules/Units/Units.qml diff --git a/ui/dev-modules/Units/qmldir b/linphone-desktop/ui/dev-modules/Units/qmldir similarity index 100% rename from ui/dev-modules/Units/qmldir rename to linphone-desktop/ui/dev-modules/Units/qmldir diff --git a/ui/modules/Common/Animations/BusyIndicator.qml b/linphone-desktop/ui/modules/Common/Animations/BusyIndicator.qml similarity index 100% rename from ui/modules/Common/Animations/BusyIndicator.qml rename to linphone-desktop/ui/modules/Common/Animations/BusyIndicator.qml diff --git a/ui/modules/Common/Constants/Constants.qml b/linphone-desktop/ui/modules/Common/Constants/Constants.qml similarity index 100% rename from ui/modules/Common/Constants/Constants.qml rename to linphone-desktop/ui/modules/Common/Constants/Constants.qml diff --git a/ui/modules/Common/Dialog/ConfirmDialog.qml b/linphone-desktop/ui/modules/Common/Dialog/ConfirmDialog.qml similarity index 100% rename from ui/modules/Common/Dialog/ConfirmDialog.qml rename to linphone-desktop/ui/modules/Common/Dialog/ConfirmDialog.qml diff --git a/ui/modules/Common/Dialog/DialogDescription.qml b/linphone-desktop/ui/modules/Common/Dialog/DialogDescription.qml similarity index 100% rename from ui/modules/Common/Dialog/DialogDescription.qml rename to linphone-desktop/ui/modules/Common/Dialog/DialogDescription.qml diff --git a/ui/modules/Common/Dialog/DialogPlus.qml b/linphone-desktop/ui/modules/Common/Dialog/DialogPlus.qml similarity index 100% rename from ui/modules/Common/Dialog/DialogPlus.qml rename to linphone-desktop/ui/modules/Common/Dialog/DialogPlus.qml diff --git a/ui/modules/Common/Form/ActionBar.qml b/linphone-desktop/ui/modules/Common/Form/ActionBar.qml similarity index 100% rename from ui/modules/Common/Form/ActionBar.qml rename to linphone-desktop/ui/modules/Common/Form/ActionBar.qml diff --git a/ui/modules/Common/Form/ActionButton.qml b/linphone-desktop/ui/modules/Common/Form/ActionButton.qml similarity index 100% rename from ui/modules/Common/Form/ActionButton.qml rename to linphone-desktop/ui/modules/Common/Form/ActionButton.qml diff --git a/ui/modules/Common/Form/ActionSwitch.qml b/linphone-desktop/ui/modules/Common/Form/ActionSwitch.qml similarity index 100% rename from ui/modules/Common/Form/ActionSwitch.qml rename to linphone-desktop/ui/modules/Common/Form/ActionSwitch.qml diff --git a/ui/modules/Common/Form/Buttons/AbstractTextButton.qml b/linphone-desktop/ui/modules/Common/Form/Buttons/AbstractTextButton.qml similarity index 100% rename from ui/modules/Common/Form/Buttons/AbstractTextButton.qml rename to linphone-desktop/ui/modules/Common/Form/Buttons/AbstractTextButton.qml diff --git a/ui/modules/Common/Form/Buttons/ExclusiveButtons.qml b/linphone-desktop/ui/modules/Common/Form/Buttons/ExclusiveButtons.qml similarity index 100% rename from ui/modules/Common/Form/Buttons/ExclusiveButtons.qml rename to linphone-desktop/ui/modules/Common/Form/Buttons/ExclusiveButtons.qml diff --git a/ui/modules/Common/Form/Buttons/ExclusiveButtons.spec.qml b/linphone-desktop/ui/modules/Common/Form/Buttons/ExclusiveButtons.spec.qml similarity index 100% rename from ui/modules/Common/Form/Buttons/ExclusiveButtons.spec.qml rename to linphone-desktop/ui/modules/Common/Form/Buttons/ExclusiveButtons.spec.qml diff --git a/ui/modules/Common/Form/Buttons/FileChooserButton.qml b/linphone-desktop/ui/modules/Common/Form/Buttons/FileChooserButton.qml similarity index 100% rename from ui/modules/Common/Form/Buttons/FileChooserButton.qml rename to linphone-desktop/ui/modules/Common/Form/Buttons/FileChooserButton.qml diff --git a/ui/modules/Common/Form/Buttons/SmallButton.qml b/linphone-desktop/ui/modules/Common/Form/Buttons/SmallButton.qml similarity index 100% rename from ui/modules/Common/Form/Buttons/SmallButton.qml rename to linphone-desktop/ui/modules/Common/Form/Buttons/SmallButton.qml diff --git a/ui/modules/Common/Form/Buttons/TextButtonA.qml b/linphone-desktop/ui/modules/Common/Form/Buttons/TextButtonA.qml similarity index 100% rename from ui/modules/Common/Form/Buttons/TextButtonA.qml rename to linphone-desktop/ui/modules/Common/Form/Buttons/TextButtonA.qml diff --git a/ui/modules/Common/Form/Buttons/TextButtonB.qml b/linphone-desktop/ui/modules/Common/Form/Buttons/TextButtonB.qml similarity index 100% rename from ui/modules/Common/Form/Buttons/TextButtonB.qml rename to linphone-desktop/ui/modules/Common/Form/Buttons/TextButtonB.qml diff --git a/ui/modules/Common/Form/CheckBoxText.qml b/linphone-desktop/ui/modules/Common/Form/CheckBoxText.qml similarity index 100% rename from ui/modules/Common/Form/CheckBoxText.qml rename to linphone-desktop/ui/modules/Common/Form/CheckBoxText.qml diff --git a/ui/modules/Common/Form/ComboBox.js b/linphone-desktop/ui/modules/Common/Form/ComboBox.js similarity index 100% rename from ui/modules/Common/Form/ComboBox.js rename to linphone-desktop/ui/modules/Common/Form/ComboBox.js diff --git a/ui/modules/Common/Form/ComboBox.qml b/linphone-desktop/ui/modules/Common/Form/ComboBox.qml similarity index 100% rename from ui/modules/Common/Form/ComboBox.qml rename to linphone-desktop/ui/modules/Common/Form/ComboBox.qml diff --git a/ui/modules/Common/Form/CommonItemDelegate.qml b/linphone-desktop/ui/modules/Common/Form/CommonItemDelegate.qml similarity index 100% rename from ui/modules/Common/Form/CommonItemDelegate.qml rename to linphone-desktop/ui/modules/Common/Form/CommonItemDelegate.qml diff --git a/ui/modules/Common/Form/DroppableTextArea.qml b/linphone-desktop/ui/modules/Common/Form/DroppableTextArea.qml similarity index 100% rename from ui/modules/Common/Form/DroppableTextArea.qml rename to linphone-desktop/ui/modules/Common/Form/DroppableTextArea.qml diff --git a/ui/modules/Common/Form/Fields/HexField.qml b/linphone-desktop/ui/modules/Common/Form/Fields/HexField.qml similarity index 100% rename from ui/modules/Common/Form/Fields/HexField.qml rename to linphone-desktop/ui/modules/Common/Form/Fields/HexField.qml diff --git a/ui/modules/Common/Form/Fields/NumericField.qml b/linphone-desktop/ui/modules/Common/Form/Fields/NumericField.qml similarity index 100% rename from ui/modules/Common/Form/Fields/NumericField.qml rename to linphone-desktop/ui/modules/Common/Form/Fields/NumericField.qml diff --git a/ui/modules/Common/Form/Fields/PasswordField.qml b/linphone-desktop/ui/modules/Common/Form/Fields/PasswordField.qml similarity index 100% rename from ui/modules/Common/Form/Fields/PasswordField.qml rename to linphone-desktop/ui/modules/Common/Form/Fields/PasswordField.qml diff --git a/ui/modules/Common/Form/Fields/PortField.qml b/linphone-desktop/ui/modules/Common/Form/Fields/PortField.qml similarity index 100% rename from ui/modules/Common/Form/Fields/PortField.qml rename to linphone-desktop/ui/modules/Common/Form/Fields/PortField.qml diff --git a/ui/modules/Common/Form/Fields/ScrollableListViewField.qml b/linphone-desktop/ui/modules/Common/Form/Fields/ScrollableListViewField.qml similarity index 100% rename from ui/modules/Common/Form/Fields/ScrollableListViewField.qml rename to linphone-desktop/ui/modules/Common/Form/Fields/ScrollableListViewField.qml diff --git a/ui/modules/Common/Form/Fields/TextAreaField.qml b/linphone-desktop/ui/modules/Common/Form/Fields/TextAreaField.qml similarity index 100% rename from ui/modules/Common/Form/Fields/TextAreaField.qml rename to linphone-desktop/ui/modules/Common/Form/Fields/TextAreaField.qml diff --git a/ui/modules/Common/Form/Fields/TextField.qml b/linphone-desktop/ui/modules/Common/Form/Fields/TextField.qml similarity index 100% rename from ui/modules/Common/Form/Fields/TextField.qml rename to linphone-desktop/ui/modules/Common/Form/Fields/TextField.qml diff --git a/ui/modules/Common/Form/ListForm.js b/linphone-desktop/ui/modules/Common/Form/ListForm.js similarity index 100% rename from ui/modules/Common/Form/ListForm.js rename to linphone-desktop/ui/modules/Common/Form/ListForm.js diff --git a/ui/modules/Common/Form/ListForm.qml b/linphone-desktop/ui/modules/Common/Form/ListForm.qml similarity index 100% rename from ui/modules/Common/Form/ListForm.qml rename to linphone-desktop/ui/modules/Common/Form/ListForm.qml diff --git a/ui/modules/Common/Form/ListItemSelector.js b/linphone-desktop/ui/modules/Common/Form/ListItemSelector.js similarity index 100% rename from ui/modules/Common/Form/ListItemSelector.js rename to linphone-desktop/ui/modules/Common/Form/ListItemSelector.js diff --git a/ui/modules/Common/Form/ListItemSelector.qml b/linphone-desktop/ui/modules/Common/Form/ListItemSelector.qml similarity index 100% rename from ui/modules/Common/Form/ListItemSelector.qml rename to linphone-desktop/ui/modules/Common/Form/ListItemSelector.qml diff --git a/ui/modules/Common/Form/Placements/Form.qml b/linphone-desktop/ui/modules/Common/Form/Placements/Form.qml similarity index 100% rename from ui/modules/Common/Form/Placements/Form.qml rename to linphone-desktop/ui/modules/Common/Form/Placements/Form.qml diff --git a/ui/modules/Common/Form/Placements/FormEmptyLine.qml b/linphone-desktop/ui/modules/Common/Form/Placements/FormEmptyLine.qml similarity index 100% rename from ui/modules/Common/Form/Placements/FormEmptyLine.qml rename to linphone-desktop/ui/modules/Common/Form/Placements/FormEmptyLine.qml diff --git a/ui/modules/Common/Form/Placements/FormGroup.qml b/linphone-desktop/ui/modules/Common/Form/Placements/FormGroup.qml similarity index 100% rename from ui/modules/Common/Form/Placements/FormGroup.qml rename to linphone-desktop/ui/modules/Common/Form/Placements/FormGroup.qml diff --git a/ui/modules/Common/Form/Placements/FormHGroup.qml b/linphone-desktop/ui/modules/Common/Form/Placements/FormHGroup.qml similarity index 100% rename from ui/modules/Common/Form/Placements/FormHGroup.qml rename to linphone-desktop/ui/modules/Common/Form/Placements/FormHGroup.qml diff --git a/ui/modules/Common/Form/Placements/FormLine.qml b/linphone-desktop/ui/modules/Common/Form/Placements/FormLine.qml similarity index 100% rename from ui/modules/Common/Form/Placements/FormLine.qml rename to linphone-desktop/ui/modules/Common/Form/Placements/FormLine.qml diff --git a/ui/modules/Common/Form/Placements/FormTable.qml b/linphone-desktop/ui/modules/Common/Form/Placements/FormTable.qml similarity index 100% rename from ui/modules/Common/Form/Placements/FormTable.qml rename to linphone-desktop/ui/modules/Common/Form/Placements/FormTable.qml diff --git a/ui/modules/Common/Form/Placements/FormTableEntry.qml b/linphone-desktop/ui/modules/Common/Form/Placements/FormTableEntry.qml similarity index 100% rename from ui/modules/Common/Form/Placements/FormTableEntry.qml rename to linphone-desktop/ui/modules/Common/Form/Placements/FormTableEntry.qml diff --git a/ui/modules/Common/Form/Placements/FormTableLine.qml b/linphone-desktop/ui/modules/Common/Form/Placements/FormTableLine.qml similarity index 100% rename from ui/modules/Common/Form/Placements/FormTableLine.qml rename to linphone-desktop/ui/modules/Common/Form/Placements/FormTableLine.qml diff --git a/ui/modules/Common/Form/Placements/FormVGroup.qml b/linphone-desktop/ui/modules/Common/Form/Placements/FormVGroup.qml similarity index 100% rename from ui/modules/Common/Form/Placements/FormVGroup.qml rename to linphone-desktop/ui/modules/Common/Form/Placements/FormVGroup.qml diff --git a/ui/modules/Common/Form/SearchBox.qml b/linphone-desktop/ui/modules/Common/Form/SearchBox.qml similarity index 100% rename from ui/modules/Common/Form/SearchBox.qml rename to linphone-desktop/ui/modules/Common/Form/SearchBox.qml diff --git a/ui/modules/Common/Form/Slider.qml b/linphone-desktop/ui/modules/Common/Form/Slider.qml similarity index 100% rename from ui/modules/Common/Form/Slider.qml rename to linphone-desktop/ui/modules/Common/Form/Slider.qml diff --git a/ui/modules/Common/Form/StaticListForm.qml b/linphone-desktop/ui/modules/Common/Form/StaticListForm.qml similarity index 100% rename from ui/modules/Common/Form/StaticListForm.qml rename to linphone-desktop/ui/modules/Common/Form/StaticListForm.qml diff --git a/ui/modules/Common/Form/Switch.qml b/linphone-desktop/ui/modules/Common/Form/Switch.qml similarity index 100% rename from ui/modules/Common/Form/Switch.qml rename to linphone-desktop/ui/modules/Common/Form/Switch.qml diff --git a/ui/modules/Common/Form/Tab/TabBar.qml b/linphone-desktop/ui/modules/Common/Form/Tab/TabBar.qml similarity index 100% rename from ui/modules/Common/Form/Tab/TabBar.qml rename to linphone-desktop/ui/modules/Common/Form/Tab/TabBar.qml diff --git a/ui/modules/Common/Form/Tab/TabButton.qml b/linphone-desktop/ui/modules/Common/Form/Tab/TabButton.qml similarity index 100% rename from ui/modules/Common/Form/Tab/TabButton.qml rename to linphone-desktop/ui/modules/Common/Form/Tab/TabButton.qml diff --git a/ui/modules/Common/Form/Tab/TabContainer.qml b/linphone-desktop/ui/modules/Common/Form/Tab/TabContainer.qml similarity index 100% rename from ui/modules/Common/Form/Tab/TabContainer.qml rename to linphone-desktop/ui/modules/Common/Form/Tab/TabContainer.qml diff --git a/ui/modules/Common/Form/TransparentTextInput.qml b/linphone-desktop/ui/modules/Common/Form/TransparentTextInput.qml similarity index 100% rename from ui/modules/Common/Form/TransparentTextInput.qml rename to linphone-desktop/ui/modules/Common/Form/TransparentTextInput.qml diff --git a/ui/modules/Common/Helpers/DragBox.qml b/linphone-desktop/ui/modules/Common/Helpers/DragBox.qml similarity index 100% rename from ui/modules/Common/Helpers/DragBox.qml rename to linphone-desktop/ui/modules/Common/Helpers/DragBox.qml diff --git a/ui/modules/Common/Helpers/InvertedMouseArea.qml b/linphone-desktop/ui/modules/Common/Helpers/InvertedMouseArea.qml similarity index 100% rename from ui/modules/Common/Helpers/InvertedMouseArea.qml rename to linphone-desktop/ui/modules/Common/Helpers/InvertedMouseArea.qml diff --git a/ui/modules/Common/Helpers/InvertedMouseArea.spec.qml b/linphone-desktop/ui/modules/Common/Helpers/InvertedMouseArea.spec.qml similarity index 100% rename from ui/modules/Common/Helpers/InvertedMouseArea.spec.qml rename to linphone-desktop/ui/modules/Common/Helpers/InvertedMouseArea.spec.qml diff --git a/ui/modules/Common/Image/Icon.qml b/linphone-desktop/ui/modules/Common/Image/Icon.qml similarity index 100% rename from ui/modules/Common/Image/Icon.qml rename to linphone-desktop/ui/modules/Common/Image/Icon.qml diff --git a/ui/modules/Common/Image/RoundedImage.qml b/linphone-desktop/ui/modules/Common/Image/RoundedImage.qml similarity index 100% rename from ui/modules/Common/Image/RoundedImage.qml rename to linphone-desktop/ui/modules/Common/Image/RoundedImage.qml diff --git a/ui/modules/Common/Indicators/VuMeter.qml b/linphone-desktop/ui/modules/Common/Indicators/VuMeter.qml similarity index 100% rename from ui/modules/Common/Indicators/VuMeter.qml rename to linphone-desktop/ui/modules/Common/Indicators/VuMeter.qml diff --git a/ui/modules/Common/Menus/ApplicationMenu.qml b/linphone-desktop/ui/modules/Common/Menus/ApplicationMenu.qml similarity index 100% rename from ui/modules/Common/Menus/ApplicationMenu.qml rename to linphone-desktop/ui/modules/Common/Menus/ApplicationMenu.qml diff --git a/ui/modules/Common/Menus/ApplicationMenuEntry.qml b/linphone-desktop/ui/modules/Common/Menus/ApplicationMenuEntry.qml similarity index 100% rename from ui/modules/Common/Menus/ApplicationMenuEntry.qml rename to linphone-desktop/ui/modules/Common/Menus/ApplicationMenuEntry.qml diff --git a/ui/modules/Common/Menus/DropDownDynamicMenu.qml b/linphone-desktop/ui/modules/Common/Menus/DropDownDynamicMenu.qml similarity index 100% rename from ui/modules/Common/Menus/DropDownDynamicMenu.qml rename to linphone-desktop/ui/modules/Common/Menus/DropDownDynamicMenu.qml diff --git a/ui/modules/Common/Menus/DropDownStaticMenu.qml b/linphone-desktop/ui/modules/Common/Menus/DropDownStaticMenu.qml similarity index 100% rename from ui/modules/Common/Menus/DropDownStaticMenu.qml rename to linphone-desktop/ui/modules/Common/Menus/DropDownStaticMenu.qml diff --git a/ui/modules/Common/Menus/DropDownStaticMenuEntry.qml b/linphone-desktop/ui/modules/Common/Menus/DropDownStaticMenuEntry.qml similarity index 100% rename from ui/modules/Common/Menus/DropDownStaticMenuEntry.qml rename to linphone-desktop/ui/modules/Common/Menus/DropDownStaticMenuEntry.qml diff --git a/ui/modules/Common/Menus/Menu.qml b/linphone-desktop/ui/modules/Common/Menus/Menu.qml similarity index 100% rename from ui/modules/Common/Menus/Menu.qml rename to linphone-desktop/ui/modules/Common/Menus/Menu.qml diff --git a/ui/modules/Common/Menus/MenuItem.qml b/linphone-desktop/ui/modules/Common/Menus/MenuItem.qml similarity index 100% rename from ui/modules/Common/Menus/MenuItem.qml rename to linphone-desktop/ui/modules/Common/Menus/MenuItem.qml diff --git a/ui/modules/Common/Misc/Borders.qml b/linphone-desktop/ui/modules/Common/Misc/Borders.qml similarity index 100% rename from ui/modules/Common/Misc/Borders.qml rename to linphone-desktop/ui/modules/Common/Misc/Borders.qml diff --git a/ui/modules/Common/Misc/ForceScrollBar.qml b/linphone-desktop/ui/modules/Common/Misc/ForceScrollBar.qml similarity index 100% rename from ui/modules/Common/Misc/ForceScrollBar.qml rename to linphone-desktop/ui/modules/Common/Misc/ForceScrollBar.qml diff --git a/ui/modules/Common/Misc/Paned.qml b/linphone-desktop/ui/modules/Common/Misc/Paned.qml similarity index 100% rename from ui/modules/Common/Misc/Paned.qml rename to linphone-desktop/ui/modules/Common/Misc/Paned.qml diff --git a/ui/modules/Common/Popup/DesktopPopup.qml b/linphone-desktop/ui/modules/Common/Popup/DesktopPopup.qml similarity index 100% rename from ui/modules/Common/Popup/DesktopPopup.qml rename to linphone-desktop/ui/modules/Common/Popup/DesktopPopup.qml diff --git a/ui/modules/Common/Popup/Popup.qml b/linphone-desktop/ui/modules/Common/Popup/Popup.qml similarity index 100% rename from ui/modules/Common/Popup/Popup.qml rename to linphone-desktop/ui/modules/Common/Popup/Popup.qml diff --git a/ui/modules/Common/Popup/PopupShadow.qml b/linphone-desktop/ui/modules/Common/Popup/PopupShadow.qml similarity index 100% rename from ui/modules/Common/Popup/PopupShadow.qml rename to linphone-desktop/ui/modules/Common/Popup/PopupShadow.qml diff --git a/ui/modules/Common/Styles/Animations/BusyIndicatorStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Animations/BusyIndicatorStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Animations/BusyIndicatorStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Animations/BusyIndicatorStyle.qml diff --git a/ui/modules/Common/Styles/Dialog/DialogStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Dialog/DialogStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Dialog/DialogStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Dialog/DialogStyle.qml diff --git a/ui/modules/Common/Styles/Form/ActionBarStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/ActionBarStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Form/ActionBarStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Form/ActionBarStyle.qml diff --git a/ui/modules/Common/Styles/Form/Buttons/AbstractTextButtonStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Buttons/AbstractTextButtonStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Form/Buttons/AbstractTextButtonStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Form/Buttons/AbstractTextButtonStyle.qml diff --git a/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml diff --git a/ui/modules/Common/Styles/Form/Buttons/FileChooserButtonStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Buttons/FileChooserButtonStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Form/Buttons/FileChooserButtonStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Form/Buttons/FileChooserButtonStyle.qml diff --git a/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml diff --git a/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml diff --git a/ui/modules/Common/Styles/Form/Buttons/TextButtonBStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Buttons/TextButtonBStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Form/Buttons/TextButtonBStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Form/Buttons/TextButtonBStyle.qml diff --git a/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml diff --git a/ui/modules/Common/Styles/Form/ComboBoxStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/ComboBoxStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Form/ComboBoxStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Form/ComboBoxStyle.qml diff --git a/ui/modules/Common/Styles/Form/CommonItemDelegateStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/CommonItemDelegateStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Form/CommonItemDelegateStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Form/CommonItemDelegateStyle.qml diff --git a/ui/modules/Common/Styles/Form/DroppableTextAreaStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/DroppableTextAreaStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Form/DroppableTextAreaStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Form/DroppableTextAreaStyle.qml diff --git a/ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml diff --git a/ui/modules/Common/Styles/Form/Fields/TextAreaFieldStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Fields/TextAreaFieldStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Form/Fields/TextAreaFieldStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Form/Fields/TextAreaFieldStyle.qml diff --git a/ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml diff --git a/ui/modules/Common/Styles/Form/ListFormStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/ListFormStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Form/ListFormStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Form/ListFormStyle.qml diff --git a/ui/modules/Common/Styles/Form/Placements/FormHGroupStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormHGroupStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Form/Placements/FormHGroupStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormHGroupStyle.qml diff --git a/ui/modules/Common/Styles/Form/Placements/FormLineStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormLineStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Form/Placements/FormLineStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormLineStyle.qml diff --git a/ui/modules/Common/Styles/Form/Placements/FormStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Form/Placements/FormStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormStyle.qml diff --git a/ui/modules/Common/Styles/Form/Placements/FormTableLineStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormTableLineStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Form/Placements/FormTableLineStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormTableLineStyle.qml diff --git a/ui/modules/Common/Styles/Form/Placements/FormTableStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormTableStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Form/Placements/FormTableStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormTableStyle.qml diff --git a/ui/modules/Common/Styles/Form/Placements/FormVGroupStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormVGroupStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Form/Placements/FormVGroupStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormVGroupStyle.qml diff --git a/ui/modules/Common/Styles/Form/SearchBoxStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/SearchBoxStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Form/SearchBoxStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Form/SearchBoxStyle.qml diff --git a/ui/modules/Common/Styles/Form/SliderStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/SliderStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Form/SliderStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Form/SliderStyle.qml diff --git a/ui/modules/Common/Styles/Form/SwitchStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/SwitchStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Form/SwitchStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Form/SwitchStyle.qml diff --git a/ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml diff --git a/ui/modules/Common/Styles/Form/Tab/TabContainerStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Tab/TabContainerStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Form/Tab/TabContainerStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Form/Tab/TabContainerStyle.qml diff --git a/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml diff --git a/ui/modules/Common/Styles/Indicators/VuMeterStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Indicators/VuMeterStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Indicators/VuMeterStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Indicators/VuMeterStyle.qml diff --git a/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml diff --git a/ui/modules/Common/Styles/Menus/DropDownStaticMenuStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Menus/DropDownStaticMenuStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Menus/DropDownStaticMenuStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Menus/DropDownStaticMenuStyle.qml diff --git a/ui/modules/Common/Styles/Menus/MenuItemStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Menus/MenuItemStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Menus/MenuItemStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Menus/MenuItemStyle.qml diff --git a/ui/modules/Common/Styles/Menus/MenuStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Menus/MenuStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Menus/MenuStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Menus/MenuStyle.qml diff --git a/ui/modules/Common/Styles/Misc/ForceScrollBarStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Misc/ForceScrollBarStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Misc/ForceScrollBarStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Misc/ForceScrollBarStyle.qml diff --git a/ui/modules/Common/Styles/Misc/PanedStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Misc/PanedStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Misc/PanedStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Misc/PanedStyle.qml diff --git a/ui/modules/Common/Styles/Popup/PopupStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Popup/PopupStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Popup/PopupStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Popup/PopupStyle.qml diff --git a/ui/modules/Common/Styles/Tooltip/TooltipStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Tooltip/TooltipStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Tooltip/TooltipStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Tooltip/TooltipStyle.qml diff --git a/ui/modules/Common/Styles/Window/WindowStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Window/WindowStyle.qml similarity index 100% rename from ui/modules/Common/Styles/Window/WindowStyle.qml rename to linphone-desktop/ui/modules/Common/Styles/Window/WindowStyle.qml diff --git a/ui/modules/Common/Styles/qmldir b/linphone-desktop/ui/modules/Common/Styles/qmldir similarity index 100% rename from ui/modules/Common/Styles/qmldir rename to linphone-desktop/ui/modules/Common/Styles/qmldir diff --git a/ui/modules/Common/Tooltip/Tooltip.qml b/linphone-desktop/ui/modules/Common/Tooltip/Tooltip.qml similarity index 100% rename from ui/modules/Common/Tooltip/Tooltip.qml rename to linphone-desktop/ui/modules/Common/Tooltip/Tooltip.qml diff --git a/ui/modules/Common/Tooltip/TooltipArea.qml b/linphone-desktop/ui/modules/Common/Tooltip/TooltipArea.qml similarity index 100% rename from ui/modules/Common/Tooltip/TooltipArea.qml rename to linphone-desktop/ui/modules/Common/Tooltip/TooltipArea.qml diff --git a/ui/modules/Common/View/ScrollableListView.qml b/linphone-desktop/ui/modules/Common/View/ScrollableListView.qml similarity index 100% rename from ui/modules/Common/View/ScrollableListView.qml rename to linphone-desktop/ui/modules/Common/View/ScrollableListView.qml diff --git a/ui/modules/Common/Window/ApplicationWindow.qml b/linphone-desktop/ui/modules/Common/Window/ApplicationWindow.qml similarity index 100% rename from ui/modules/Common/Window/ApplicationWindow.qml rename to linphone-desktop/ui/modules/Common/Window/ApplicationWindow.qml diff --git a/ui/modules/Common/Window/VirtualWindow.qml b/linphone-desktop/ui/modules/Common/Window/VirtualWindow.qml similarity index 100% rename from ui/modules/Common/Window/VirtualWindow.qml rename to linphone-desktop/ui/modules/Common/Window/VirtualWindow.qml diff --git a/ui/modules/Common/Window/Window.js b/linphone-desktop/ui/modules/Common/Window/Window.js similarity index 100% rename from ui/modules/Common/Window/Window.js rename to linphone-desktop/ui/modules/Common/Window/Window.js diff --git a/ui/modules/Common/Window/Window.qml b/linphone-desktop/ui/modules/Common/Window/Window.qml similarity index 100% rename from ui/modules/Common/Window/Window.qml rename to linphone-desktop/ui/modules/Common/Window/Window.qml diff --git a/ui/modules/Common/qmldir b/linphone-desktop/ui/modules/Common/qmldir similarity index 100% rename from ui/modules/Common/qmldir rename to linphone-desktop/ui/modules/Common/qmldir diff --git a/ui/modules/Konami/Konami.qml b/linphone-desktop/ui/modules/Konami/Konami.qml similarity index 100% rename from ui/modules/Konami/Konami.qml rename to linphone-desktop/ui/modules/Konami/Konami.qml diff --git a/ui/modules/Konami/qmldir b/linphone-desktop/ui/modules/Konami/qmldir similarity index 100% rename from ui/modules/Konami/qmldir rename to linphone-desktop/ui/modules/Konami/qmldir diff --git a/ui/modules/Linphone/Account/AccountStatus.qml b/linphone-desktop/ui/modules/Linphone/Account/AccountStatus.qml similarity index 100% rename from ui/modules/Linphone/Account/AccountStatus.qml rename to linphone-desktop/ui/modules/Linphone/Account/AccountStatus.qml diff --git a/ui/modules/Linphone/Blocks/CardBlock.qml b/linphone-desktop/ui/modules/Linphone/Blocks/CardBlock.qml similarity index 100% rename from ui/modules/Linphone/Blocks/CardBlock.qml rename to linphone-desktop/ui/modules/Linphone/Blocks/CardBlock.qml diff --git a/ui/modules/Linphone/Blocks/RequestBlock.qml b/linphone-desktop/ui/modules/Linphone/Blocks/RequestBlock.qml similarity index 100% rename from ui/modules/Linphone/Blocks/RequestBlock.qml rename to linphone-desktop/ui/modules/Linphone/Blocks/RequestBlock.qml diff --git a/ui/modules/Linphone/Calls/CallControls.qml b/linphone-desktop/ui/modules/Linphone/Calls/CallControls.qml similarity index 100% rename from ui/modules/Linphone/Calls/CallControls.qml rename to linphone-desktop/ui/modules/Linphone/Calls/CallControls.qml diff --git a/ui/modules/Linphone/Calls/CallStatistics.qml b/linphone-desktop/ui/modules/Linphone/Calls/CallStatistics.qml similarity index 100% rename from ui/modules/Linphone/Calls/CallStatistics.qml rename to linphone-desktop/ui/modules/Linphone/Calls/CallStatistics.qml diff --git a/ui/modules/Linphone/Calls/Calls.js b/linphone-desktop/ui/modules/Linphone/Calls/Calls.js similarity index 100% rename from ui/modules/Linphone/Calls/Calls.js rename to linphone-desktop/ui/modules/Linphone/Calls/Calls.js diff --git a/ui/modules/Linphone/Calls/Calls.qml b/linphone-desktop/ui/modules/Linphone/Calls/Calls.qml similarity index 100% rename from ui/modules/Linphone/Calls/Calls.qml rename to linphone-desktop/ui/modules/Linphone/Calls/Calls.qml diff --git a/ui/modules/Linphone/Calls/ConferenceControls.qml b/linphone-desktop/ui/modules/Linphone/Calls/ConferenceControls.qml similarity index 100% rename from ui/modules/Linphone/Calls/ConferenceControls.qml rename to linphone-desktop/ui/modules/Linphone/Calls/ConferenceControls.qml diff --git a/ui/modules/Linphone/Chat/Chat.js b/linphone-desktop/ui/modules/Linphone/Chat/Chat.js similarity index 100% rename from ui/modules/Linphone/Chat/Chat.js rename to linphone-desktop/ui/modules/Linphone/Chat/Chat.js diff --git a/ui/modules/Linphone/Chat/Chat.qml b/linphone-desktop/ui/modules/Linphone/Chat/Chat.qml similarity index 100% rename from ui/modules/Linphone/Chat/Chat.qml rename to linphone-desktop/ui/modules/Linphone/Chat/Chat.qml diff --git a/ui/modules/Linphone/Chat/Event.qml b/linphone-desktop/ui/modules/Linphone/Chat/Event.qml similarity index 100% rename from ui/modules/Linphone/Chat/Event.qml rename to linphone-desktop/ui/modules/Linphone/Chat/Event.qml diff --git a/ui/modules/Linphone/Chat/FileMessage.qml b/linphone-desktop/ui/modules/Linphone/Chat/FileMessage.qml similarity index 100% rename from ui/modules/Linphone/Chat/FileMessage.qml rename to linphone-desktop/ui/modules/Linphone/Chat/FileMessage.qml diff --git a/ui/modules/Linphone/Chat/IncomingMessage.qml b/linphone-desktop/ui/modules/Linphone/Chat/IncomingMessage.qml similarity index 100% rename from ui/modules/Linphone/Chat/IncomingMessage.qml rename to linphone-desktop/ui/modules/Linphone/Chat/IncomingMessage.qml diff --git a/ui/modules/Linphone/Chat/Message.js b/linphone-desktop/ui/modules/Linphone/Chat/Message.js similarity index 100% rename from ui/modules/Linphone/Chat/Message.js rename to linphone-desktop/ui/modules/Linphone/Chat/Message.js diff --git a/ui/modules/Linphone/Chat/Message.qml b/linphone-desktop/ui/modules/Linphone/Chat/Message.qml similarity index 100% rename from ui/modules/Linphone/Chat/Message.qml rename to linphone-desktop/ui/modules/Linphone/Chat/Message.qml diff --git a/ui/modules/Linphone/Chat/OutgoingMessage.qml b/linphone-desktop/ui/modules/Linphone/Chat/OutgoingMessage.qml similarity index 100% rename from ui/modules/Linphone/Chat/OutgoingMessage.qml rename to linphone-desktop/ui/modules/Linphone/Chat/OutgoingMessage.qml diff --git a/ui/modules/Linphone/Codecs/CodecAttribute.qml b/linphone-desktop/ui/modules/Linphone/Codecs/CodecAttribute.qml similarity index 100% rename from ui/modules/Linphone/Codecs/CodecAttribute.qml rename to linphone-desktop/ui/modules/Linphone/Codecs/CodecAttribute.qml diff --git a/ui/modules/Linphone/Codecs/CodecLegend.qml b/linphone-desktop/ui/modules/Linphone/Codecs/CodecLegend.qml similarity index 100% rename from ui/modules/Linphone/Codecs/CodecLegend.qml rename to linphone-desktop/ui/modules/Linphone/Codecs/CodecLegend.qml diff --git a/ui/modules/Linphone/Codecs/CodecsViewer.qml b/linphone-desktop/ui/modules/Linphone/Codecs/CodecsViewer.qml similarity index 100% rename from ui/modules/Linphone/Codecs/CodecsViewer.qml rename to linphone-desktop/ui/modules/Linphone/Codecs/CodecsViewer.qml diff --git a/ui/modules/Linphone/Contact/Avatar.qml b/linphone-desktop/ui/modules/Linphone/Contact/Avatar.qml similarity index 100% rename from ui/modules/Linphone/Contact/Avatar.qml rename to linphone-desktop/ui/modules/Linphone/Contact/Avatar.qml diff --git a/ui/modules/Linphone/Contact/Contact.qml b/linphone-desktop/ui/modules/Linphone/Contact/Contact.qml similarity index 100% rename from ui/modules/Linphone/Contact/Contact.qml rename to linphone-desktop/ui/modules/Linphone/Contact/Contact.qml diff --git a/ui/modules/Linphone/Contact/ContactDescription.qml b/linphone-desktop/ui/modules/Linphone/Contact/ContactDescription.qml similarity index 100% rename from ui/modules/Linphone/Contact/ContactDescription.qml rename to linphone-desktop/ui/modules/Linphone/Contact/ContactDescription.qml diff --git a/ui/modules/Linphone/Contact/ContactMessageCounter.qml b/linphone-desktop/ui/modules/Linphone/Contact/ContactMessageCounter.qml similarity index 100% rename from ui/modules/Linphone/Contact/ContactMessageCounter.qml rename to linphone-desktop/ui/modules/Linphone/Contact/ContactMessageCounter.qml diff --git a/ui/modules/Linphone/Dialog/OnlineInstallerDialog.qml b/linphone-desktop/ui/modules/Linphone/Dialog/OnlineInstallerDialog.qml similarity index 100% rename from ui/modules/Linphone/Dialog/OnlineInstallerDialog.qml rename to linphone-desktop/ui/modules/Linphone/Dialog/OnlineInstallerDialog.qml diff --git a/ui/modules/Linphone/Menus/SipAddressesMenu.qml b/linphone-desktop/ui/modules/Linphone/Menus/SipAddressesMenu.qml similarity index 100% rename from ui/modules/Linphone/Menus/SipAddressesMenu.qml rename to linphone-desktop/ui/modules/Linphone/Menus/SipAddressesMenu.qml diff --git a/ui/modules/Linphone/Misc/MessageCounter.qml b/linphone-desktop/ui/modules/Linphone/Misc/MessageCounter.qml similarity index 100% rename from ui/modules/Linphone/Misc/MessageCounter.qml rename to linphone-desktop/ui/modules/Linphone/Misc/MessageCounter.qml diff --git a/ui/modules/Linphone/Notifications/Notification.qml b/linphone-desktop/ui/modules/Linphone/Notifications/Notification.qml similarity index 100% rename from ui/modules/Linphone/Notifications/Notification.qml rename to linphone-desktop/ui/modules/Linphone/Notifications/Notification.qml diff --git a/ui/modules/Linphone/Notifications/Notification.spec.qml b/linphone-desktop/ui/modules/Linphone/Notifications/Notification.spec.qml similarity index 100% rename from ui/modules/Linphone/Notifications/Notification.spec.qml rename to linphone-desktop/ui/modules/Linphone/Notifications/Notification.spec.qml diff --git a/ui/modules/Linphone/Notifications/NotificationBasic.qml b/linphone-desktop/ui/modules/Linphone/Notifications/NotificationBasic.qml similarity index 100% rename from ui/modules/Linphone/Notifications/NotificationBasic.qml rename to linphone-desktop/ui/modules/Linphone/Notifications/NotificationBasic.qml diff --git a/ui/modules/Linphone/Notifications/NotificationNewVersionAvailable.qml b/linphone-desktop/ui/modules/Linphone/Notifications/NotificationNewVersionAvailable.qml similarity index 100% rename from ui/modules/Linphone/Notifications/NotificationNewVersionAvailable.qml rename to linphone-desktop/ui/modules/Linphone/Notifications/NotificationNewVersionAvailable.qml diff --git a/ui/modules/Linphone/Notifications/NotificationReceivedCall.qml b/linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedCall.qml similarity index 100% rename from ui/modules/Linphone/Notifications/NotificationReceivedCall.qml rename to linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedCall.qml diff --git a/ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml b/linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml similarity index 100% rename from ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml rename to linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml diff --git a/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml b/linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml similarity index 100% rename from ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml rename to linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml diff --git a/ui/modules/Linphone/Notifications/NotificationRecordingCompleted.qml b/linphone-desktop/ui/modules/Linphone/Notifications/NotificationRecordingCompleted.qml similarity index 100% rename from ui/modules/Linphone/Notifications/NotificationRecordingCompleted.qml rename to linphone-desktop/ui/modules/Linphone/Notifications/NotificationRecordingCompleted.qml diff --git a/ui/modules/Linphone/Notifications/NotificationSnapshotWasTaken.qml b/linphone-desktop/ui/modules/Linphone/Notifications/NotificationSnapshotWasTaken.qml similarity index 100% rename from ui/modules/Linphone/Notifications/NotificationSnapshotWasTaken.qml rename to linphone-desktop/ui/modules/Linphone/Notifications/NotificationSnapshotWasTaken.qml diff --git a/ui/modules/Linphone/Presence/PresenceLevel.qml b/linphone-desktop/ui/modules/Linphone/Presence/PresenceLevel.qml similarity index 100% rename from ui/modules/Linphone/Presence/PresenceLevel.qml rename to linphone-desktop/ui/modules/Linphone/Presence/PresenceLevel.qml diff --git a/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml b/linphone-desktop/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml similarity index 100% rename from ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml rename to linphone-desktop/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml diff --git a/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml similarity index 100% rename from ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml rename to linphone-desktop/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml diff --git a/ui/modules/Linphone/Styles/Blocks/CardBlockStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Blocks/CardBlockStyle.qml similarity index 100% rename from ui/modules/Linphone/Styles/Blocks/CardBlockStyle.qml rename to linphone-desktop/ui/modules/Linphone/Styles/Blocks/CardBlockStyle.qml diff --git a/ui/modules/Linphone/Styles/Blocks/RequestBlockStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Blocks/RequestBlockStyle.qml similarity index 100% rename from ui/modules/Linphone/Styles/Blocks/RequestBlockStyle.qml rename to linphone-desktop/ui/modules/Linphone/Styles/Blocks/RequestBlockStyle.qml diff --git a/ui/modules/Linphone/Styles/Calls/CallControlsStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Calls/CallControlsStyle.qml similarity index 100% rename from ui/modules/Linphone/Styles/Calls/CallControlsStyle.qml rename to linphone-desktop/ui/modules/Linphone/Styles/Calls/CallControlsStyle.qml diff --git a/ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml similarity index 100% rename from ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml rename to linphone-desktop/ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml diff --git a/ui/modules/Linphone/Styles/Calls/CallsStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Calls/CallsStyle.qml similarity index 100% rename from ui/modules/Linphone/Styles/Calls/CallsStyle.qml rename to linphone-desktop/ui/modules/Linphone/Styles/Calls/CallsStyle.qml diff --git a/ui/modules/Linphone/Styles/Calls/ConferenceControlsStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Calls/ConferenceControlsStyle.qml similarity index 100% rename from ui/modules/Linphone/Styles/Calls/ConferenceControlsStyle.qml rename to linphone-desktop/ui/modules/Linphone/Styles/Calls/ConferenceControlsStyle.qml diff --git a/ui/modules/Linphone/Styles/Chat/ChatStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Chat/ChatStyle.qml similarity index 100% rename from ui/modules/Linphone/Styles/Chat/ChatStyle.qml rename to linphone-desktop/ui/modules/Linphone/Styles/Chat/ChatStyle.qml diff --git a/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml similarity index 100% rename from ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml rename to linphone-desktop/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml diff --git a/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml similarity index 100% rename from ui/modules/Linphone/Styles/Contact/AvatarStyle.qml rename to linphone-desktop/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml diff --git a/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml similarity index 100% rename from ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml rename to linphone-desktop/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml diff --git a/ui/modules/Linphone/Styles/Contact/ContactMessageCounterStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Contact/ContactMessageCounterStyle.qml similarity index 100% rename from ui/modules/Linphone/Styles/Contact/ContactMessageCounterStyle.qml rename to linphone-desktop/ui/modules/Linphone/Styles/Contact/ContactMessageCounterStyle.qml diff --git a/ui/modules/Linphone/Styles/Contact/ContactStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Contact/ContactStyle.qml similarity index 100% rename from ui/modules/Linphone/Styles/Contact/ContactStyle.qml rename to linphone-desktop/ui/modules/Linphone/Styles/Contact/ContactStyle.qml diff --git a/ui/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml similarity index 100% rename from ui/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml rename to linphone-desktop/ui/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml diff --git a/ui/modules/Linphone/Styles/Menus/SipAddressesMenuStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Menus/SipAddressesMenuStyle.qml similarity index 100% rename from ui/modules/Linphone/Styles/Menus/SipAddressesMenuStyle.qml rename to linphone-desktop/ui/modules/Linphone/Styles/Menus/SipAddressesMenuStyle.qml diff --git a/ui/modules/Linphone/Styles/Misc/MessageCounterStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Misc/MessageCounterStyle.qml similarity index 100% rename from ui/modules/Linphone/Styles/Misc/MessageCounterStyle.qml rename to linphone-desktop/ui/modules/Linphone/Styles/Misc/MessageCounterStyle.qml diff --git a/ui/modules/Linphone/Styles/Notifications/NotificationBasicStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationBasicStyle.qml similarity index 100% rename from ui/modules/Linphone/Styles/Notifications/NotificationBasicStyle.qml rename to linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationBasicStyle.qml diff --git a/ui/modules/Linphone/Styles/Notifications/NotificationReceivedCallStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationReceivedCallStyle.qml similarity index 100% rename from ui/modules/Linphone/Styles/Notifications/NotificationReceivedCallStyle.qml rename to linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationReceivedCallStyle.qml diff --git a/ui/modules/Linphone/Styles/Notifications/NotificationReceivedFileMessageStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationReceivedFileMessageStyle.qml similarity index 100% rename from ui/modules/Linphone/Styles/Notifications/NotificationReceivedFileMessageStyle.qml rename to linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationReceivedFileMessageStyle.qml diff --git a/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml similarity index 100% rename from ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml rename to linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml diff --git a/ui/modules/Linphone/Styles/Notifications/NotificationStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationStyle.qml similarity index 100% rename from ui/modules/Linphone/Styles/Notifications/NotificationStyle.qml rename to linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationStyle.qml diff --git a/ui/modules/Linphone/Styles/TelKeypad/TelKeypadStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/TelKeypad/TelKeypadStyle.qml similarity index 100% rename from ui/modules/Linphone/Styles/TelKeypad/TelKeypadStyle.qml rename to linphone-desktop/ui/modules/Linphone/Styles/TelKeypad/TelKeypadStyle.qml diff --git a/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml similarity index 100% rename from ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml rename to linphone-desktop/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml diff --git a/ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml similarity index 100% rename from ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml rename to linphone-desktop/ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml diff --git a/ui/modules/Linphone/Styles/qmldir b/linphone-desktop/ui/modules/Linphone/Styles/qmldir similarity index 100% rename from ui/modules/Linphone/Styles/qmldir rename to linphone-desktop/ui/modules/Linphone/Styles/qmldir diff --git a/ui/modules/Linphone/TelKeypad/TelKeypad.js b/linphone-desktop/ui/modules/Linphone/TelKeypad/TelKeypad.js similarity index 100% rename from ui/modules/Linphone/TelKeypad/TelKeypad.js rename to linphone-desktop/ui/modules/Linphone/TelKeypad/TelKeypad.js diff --git a/ui/modules/Linphone/TelKeypad/TelKeypad.qml b/linphone-desktop/ui/modules/Linphone/TelKeypad/TelKeypad.qml similarity index 100% rename from ui/modules/Linphone/TelKeypad/TelKeypad.qml rename to linphone-desktop/ui/modules/Linphone/TelKeypad/TelKeypad.qml diff --git a/ui/modules/Linphone/TelKeypad/TelKeypadButton.qml b/linphone-desktop/ui/modules/Linphone/TelKeypad/TelKeypadButton.qml similarity index 100% rename from ui/modules/Linphone/TelKeypad/TelKeypadButton.qml rename to linphone-desktop/ui/modules/Linphone/TelKeypad/TelKeypadButton.qml diff --git a/ui/modules/Linphone/Timeline/Timeline.js b/linphone-desktop/ui/modules/Linphone/Timeline/Timeline.js similarity index 100% rename from ui/modules/Linphone/Timeline/Timeline.js rename to linphone-desktop/ui/modules/Linphone/Timeline/Timeline.js diff --git a/ui/modules/Linphone/Timeline/Timeline.qml b/linphone-desktop/ui/modules/Linphone/Timeline/Timeline.qml similarity index 100% rename from ui/modules/Linphone/Timeline/Timeline.qml rename to linphone-desktop/ui/modules/Linphone/Timeline/Timeline.qml diff --git a/ui/modules/Linphone/View/SipAddressesView.qml b/linphone-desktop/ui/modules/Linphone/View/SipAddressesView.qml similarity index 100% rename from ui/modules/Linphone/View/SipAddressesView.qml rename to linphone-desktop/ui/modules/Linphone/View/SipAddressesView.qml diff --git a/ui/modules/Linphone/qmldir b/linphone-desktop/ui/modules/Linphone/qmldir similarity index 100% rename from ui/modules/Linphone/qmldir rename to linphone-desktop/ui/modules/Linphone/qmldir diff --git a/ui/scripts/LinphoneUtils/linphone-utils.js b/linphone-desktop/ui/scripts/LinphoneUtils/linphone-utils.js similarity index 100% rename from ui/scripts/LinphoneUtils/linphone-utils.js rename to linphone-desktop/ui/scripts/LinphoneUtils/linphone-utils.js diff --git a/ui/scripts/LinphoneUtils/qmldir b/linphone-desktop/ui/scripts/LinphoneUtils/qmldir similarity index 100% rename from ui/scripts/LinphoneUtils/qmldir rename to linphone-desktop/ui/scripts/LinphoneUtils/qmldir diff --git a/ui/scripts/Utils/port-tools.js b/linphone-desktop/ui/scripts/Utils/port-tools.js similarity index 100% rename from ui/scripts/Utils/port-tools.js rename to linphone-desktop/ui/scripts/Utils/port-tools.js diff --git a/ui/scripts/Utils/qmldir b/linphone-desktop/ui/scripts/Utils/qmldir similarity index 100% rename from ui/scripts/Utils/qmldir rename to linphone-desktop/ui/scripts/Utils/qmldir diff --git a/ui/scripts/Utils/uri-tools.js b/linphone-desktop/ui/scripts/Utils/uri-tools.js similarity index 100% rename from ui/scripts/Utils/uri-tools.js rename to linphone-desktop/ui/scripts/Utils/uri-tools.js diff --git a/ui/scripts/Utils/uri-tools.spec.qml b/linphone-desktop/ui/scripts/Utils/uri-tools.spec.qml similarity index 100% rename from ui/scripts/Utils/uri-tools.spec.qml rename to linphone-desktop/ui/scripts/Utils/uri-tools.spec.qml diff --git a/ui/scripts/Utils/utils.js b/linphone-desktop/ui/scripts/Utils/utils.js similarity index 100% rename from ui/scripts/Utils/utils.js rename to linphone-desktop/ui/scripts/Utils/utils.js diff --git a/ui/scripts/Utils/utils.spec.qml b/linphone-desktop/ui/scripts/Utils/utils.spec.qml similarity index 100% rename from ui/scripts/Utils/utils.spec.qml rename to linphone-desktop/ui/scripts/Utils/utils.spec.qml diff --git a/ui/views/App/Calls/AbstractStartingCall.qml b/linphone-desktop/ui/views/App/Calls/AbstractStartingCall.qml similarity index 100% rename from ui/views/App/Calls/AbstractStartingCall.qml rename to linphone-desktop/ui/views/App/Calls/AbstractStartingCall.qml diff --git a/ui/views/App/Calls/CallsWindow.js b/linphone-desktop/ui/views/App/Calls/CallsWindow.js similarity index 100% rename from ui/views/App/Calls/CallsWindow.js rename to linphone-desktop/ui/views/App/Calls/CallsWindow.js diff --git a/ui/views/App/Calls/CallsWindow.qml b/linphone-desktop/ui/views/App/Calls/CallsWindow.qml similarity index 100% rename from ui/views/App/Calls/CallsWindow.qml rename to linphone-desktop/ui/views/App/Calls/CallsWindow.qml diff --git a/ui/views/App/Calls/Conference.qml b/linphone-desktop/ui/views/App/Calls/Conference.qml similarity index 100% rename from ui/views/App/Calls/Conference.qml rename to linphone-desktop/ui/views/App/Calls/Conference.qml diff --git a/ui/views/App/Calls/Dialogs/CallSipAddress.qml b/linphone-desktop/ui/views/App/Calls/Dialogs/CallSipAddress.qml similarity index 100% rename from ui/views/App/Calls/Dialogs/CallSipAddress.qml rename to linphone-desktop/ui/views/App/Calls/Dialogs/CallSipAddress.qml diff --git a/ui/views/App/Calls/Dialogs/CallTransfer.qml b/linphone-desktop/ui/views/App/Calls/Dialogs/CallTransfer.qml similarity index 100% rename from ui/views/App/Calls/Dialogs/CallTransfer.qml rename to linphone-desktop/ui/views/App/Calls/Dialogs/CallTransfer.qml diff --git a/ui/views/App/Calls/Dialogs/ConferenceManager.qml b/linphone-desktop/ui/views/App/Calls/Dialogs/ConferenceManager.qml similarity index 100% rename from ui/views/App/Calls/Dialogs/ConferenceManager.qml rename to linphone-desktop/ui/views/App/Calls/Dialogs/ConferenceManager.qml diff --git a/ui/views/App/Calls/Dialogs/MultimediaParameters.qml b/linphone-desktop/ui/views/App/Calls/Dialogs/MultimediaParameters.qml similarity index 100% rename from ui/views/App/Calls/Dialogs/MultimediaParameters.qml rename to linphone-desktop/ui/views/App/Calls/Dialogs/MultimediaParameters.qml diff --git a/ui/views/App/Calls/EndedCall.qml b/linphone-desktop/ui/views/App/Calls/EndedCall.qml similarity index 100% rename from ui/views/App/Calls/EndedCall.qml rename to linphone-desktop/ui/views/App/Calls/EndedCall.qml diff --git a/ui/views/App/Calls/Incall.js b/linphone-desktop/ui/views/App/Calls/Incall.js similarity index 100% rename from ui/views/App/Calls/Incall.js rename to linphone-desktop/ui/views/App/Calls/Incall.js diff --git a/ui/views/App/Calls/Incall.qml b/linphone-desktop/ui/views/App/Calls/Incall.qml similarity index 100% rename from ui/views/App/Calls/Incall.qml rename to linphone-desktop/ui/views/App/Calls/Incall.qml diff --git a/ui/views/App/Calls/IncallAvatar.qml b/linphone-desktop/ui/views/App/Calls/IncallAvatar.qml similarity index 100% rename from ui/views/App/Calls/IncallAvatar.qml rename to linphone-desktop/ui/views/App/Calls/IncallAvatar.qml diff --git a/ui/views/App/Calls/IncallFullscreenWindow.qml b/linphone-desktop/ui/views/App/Calls/IncallFullscreenWindow.qml similarity index 100% rename from ui/views/App/Calls/IncallFullscreenWindow.qml rename to linphone-desktop/ui/views/App/Calls/IncallFullscreenWindow.qml diff --git a/ui/views/App/Calls/IncomingCall.qml b/linphone-desktop/ui/views/App/Calls/IncomingCall.qml similarity index 100% rename from ui/views/App/Calls/IncomingCall.qml rename to linphone-desktop/ui/views/App/Calls/IncomingCall.qml diff --git a/ui/views/App/Calls/OutgoingCall.qml b/linphone-desktop/ui/views/App/Calls/OutgoingCall.qml similarity index 100% rename from ui/views/App/Calls/OutgoingCall.qml rename to linphone-desktop/ui/views/App/Calls/OutgoingCall.qml diff --git a/ui/views/App/Calls/ZrtpTokenAuthentication.qml b/linphone-desktop/ui/views/App/Calls/ZrtpTokenAuthentication.qml similarity index 100% rename from ui/views/App/Calls/ZrtpTokenAuthentication.qml rename to linphone-desktop/ui/views/App/Calls/ZrtpTokenAuthentication.qml diff --git a/ui/views/App/Main/Assistant.qml b/linphone-desktop/ui/views/App/Main/Assistant.qml similarity index 100% rename from ui/views/App/Main/Assistant.qml rename to linphone-desktop/ui/views/App/Main/Assistant.qml diff --git a/ui/views/App/Main/Assistant/ActivateAppSipAccountWithEmail.qml b/linphone-desktop/ui/views/App/Main/Assistant/ActivateAppSipAccountWithEmail.qml similarity index 100% rename from ui/views/App/Main/Assistant/ActivateAppSipAccountWithEmail.qml rename to linphone-desktop/ui/views/App/Main/Assistant/ActivateAppSipAccountWithEmail.qml diff --git a/ui/views/App/Main/Assistant/ActivateAppSipAccountWithPhoneNumber.qml b/linphone-desktop/ui/views/App/Main/Assistant/ActivateAppSipAccountWithPhoneNumber.qml similarity index 100% rename from ui/views/App/Main/Assistant/ActivateAppSipAccountWithPhoneNumber.qml rename to linphone-desktop/ui/views/App/Main/Assistant/ActivateAppSipAccountWithPhoneNumber.qml diff --git a/ui/views/App/Main/Assistant/AssistantAbstractView.qml b/linphone-desktop/ui/views/App/Main/Assistant/AssistantAbstractView.qml similarity index 100% rename from ui/views/App/Main/Assistant/AssistantAbstractView.qml rename to linphone-desktop/ui/views/App/Main/Assistant/AssistantAbstractView.qml diff --git a/ui/views/App/Main/Assistant/AssistantHome.qml b/linphone-desktop/ui/views/App/Main/Assistant/AssistantHome.qml similarity index 100% rename from ui/views/App/Main/Assistant/AssistantHome.qml rename to linphone-desktop/ui/views/App/Main/Assistant/AssistantHome.qml diff --git a/ui/views/App/Main/Assistant/CreateAppSipAccount.qml b/linphone-desktop/ui/views/App/Main/Assistant/CreateAppSipAccount.qml similarity index 100% rename from ui/views/App/Main/Assistant/CreateAppSipAccount.qml rename to linphone-desktop/ui/views/App/Main/Assistant/CreateAppSipAccount.qml diff --git a/ui/views/App/Main/Assistant/CreateAppSipAccountWithEmail.qml b/linphone-desktop/ui/views/App/Main/Assistant/CreateAppSipAccountWithEmail.qml similarity index 100% rename from ui/views/App/Main/Assistant/CreateAppSipAccountWithEmail.qml rename to linphone-desktop/ui/views/App/Main/Assistant/CreateAppSipAccountWithEmail.qml diff --git a/ui/views/App/Main/Assistant/CreateAppSipAccountWithPhoneNumber.qml b/linphone-desktop/ui/views/App/Main/Assistant/CreateAppSipAccountWithPhoneNumber.qml similarity index 100% rename from ui/views/App/Main/Assistant/CreateAppSipAccountWithPhoneNumber.qml rename to linphone-desktop/ui/views/App/Main/Assistant/CreateAppSipAccountWithPhoneNumber.qml diff --git a/ui/views/App/Main/Assistant/FetchRemoteConfiguration.qml b/linphone-desktop/ui/views/App/Main/Assistant/FetchRemoteConfiguration.qml similarity index 100% rename from ui/views/App/Main/Assistant/FetchRemoteConfiguration.qml rename to linphone-desktop/ui/views/App/Main/Assistant/FetchRemoteConfiguration.qml diff --git a/ui/views/App/Main/Assistant/UseAppSipAccount.qml b/linphone-desktop/ui/views/App/Main/Assistant/UseAppSipAccount.qml similarity index 100% rename from ui/views/App/Main/Assistant/UseAppSipAccount.qml rename to linphone-desktop/ui/views/App/Main/Assistant/UseAppSipAccount.qml diff --git a/ui/views/App/Main/Assistant/UseAppSipAccountWithPhoneNumber.qml b/linphone-desktop/ui/views/App/Main/Assistant/UseAppSipAccountWithPhoneNumber.qml similarity index 100% rename from ui/views/App/Main/Assistant/UseAppSipAccountWithPhoneNumber.qml rename to linphone-desktop/ui/views/App/Main/Assistant/UseAppSipAccountWithPhoneNumber.qml diff --git a/ui/views/App/Main/Assistant/UseAppSipAccountWithUsername.qml b/linphone-desktop/ui/views/App/Main/Assistant/UseAppSipAccountWithUsername.qml similarity index 100% rename from ui/views/App/Main/Assistant/UseAppSipAccountWithUsername.qml rename to linphone-desktop/ui/views/App/Main/Assistant/UseAppSipAccountWithUsername.qml diff --git a/ui/views/App/Main/Assistant/UseOtherSipAccount.qml b/linphone-desktop/ui/views/App/Main/Assistant/UseOtherSipAccount.qml similarity index 100% rename from ui/views/App/Main/Assistant/UseOtherSipAccount.qml rename to linphone-desktop/ui/views/App/Main/Assistant/UseOtherSipAccount.qml diff --git a/ui/views/App/Main/ContactEdit.js b/linphone-desktop/ui/views/App/Main/ContactEdit.js similarity index 100% rename from ui/views/App/Main/ContactEdit.js rename to linphone-desktop/ui/views/App/Main/ContactEdit.js diff --git a/ui/views/App/Main/ContactEdit.qml b/linphone-desktop/ui/views/App/Main/ContactEdit.qml similarity index 100% rename from ui/views/App/Main/ContactEdit.qml rename to linphone-desktop/ui/views/App/Main/ContactEdit.qml diff --git a/ui/views/App/Main/Contacts.qml b/linphone-desktop/ui/views/App/Main/Contacts.qml similarity index 100% rename from ui/views/App/Main/Contacts.qml rename to linphone-desktop/ui/views/App/Main/Contacts.qml diff --git a/ui/views/App/Main/Conversation.js b/linphone-desktop/ui/views/App/Main/Conversation.js similarity index 100% rename from ui/views/App/Main/Conversation.js rename to linphone-desktop/ui/views/App/Main/Conversation.js diff --git a/ui/views/App/Main/Conversation.qml b/linphone-desktop/ui/views/App/Main/Conversation.qml similarity index 100% rename from ui/views/App/Main/Conversation.qml rename to linphone-desktop/ui/views/App/Main/Conversation.qml diff --git a/ui/views/App/Main/Dialogs/About.qml b/linphone-desktop/ui/views/App/Main/Dialogs/About.qml similarity index 100% rename from ui/views/App/Main/Dialogs/About.qml rename to linphone-desktop/ui/views/App/Main/Dialogs/About.qml diff --git a/ui/views/App/Main/Dialogs/AuthenticationRequest.js b/linphone-desktop/ui/views/App/Main/Dialogs/AuthenticationRequest.js similarity index 100% rename from ui/views/App/Main/Dialogs/AuthenticationRequest.js rename to linphone-desktop/ui/views/App/Main/Dialogs/AuthenticationRequest.js diff --git a/ui/views/App/Main/Dialogs/AuthenticationRequest.qml b/linphone-desktop/ui/views/App/Main/Dialogs/AuthenticationRequest.qml similarity index 100% rename from ui/views/App/Main/Dialogs/AuthenticationRequest.qml rename to linphone-desktop/ui/views/App/Main/Dialogs/AuthenticationRequest.qml diff --git a/ui/views/App/Main/Dialogs/ManageAccount.js b/linphone-desktop/ui/views/App/Main/Dialogs/ManageAccount.js similarity index 100% rename from ui/views/App/Main/Dialogs/ManageAccount.js rename to linphone-desktop/ui/views/App/Main/Dialogs/ManageAccount.js diff --git a/ui/views/App/Main/Dialogs/ManageAccounts.qml b/linphone-desktop/ui/views/App/Main/Dialogs/ManageAccounts.qml similarity index 100% rename from ui/views/App/Main/Dialogs/ManageAccounts.qml rename to linphone-desktop/ui/views/App/Main/Dialogs/ManageAccounts.qml diff --git a/ui/views/App/Main/Home.qml b/linphone-desktop/ui/views/App/Main/Home.qml similarity index 100% rename from ui/views/App/Main/Home.qml rename to linphone-desktop/ui/views/App/Main/Home.qml diff --git a/ui/views/App/Main/InviteFriends.qml b/linphone-desktop/ui/views/App/Main/InviteFriends.qml similarity index 100% rename from ui/views/App/Main/InviteFriends.qml rename to linphone-desktop/ui/views/App/Main/InviteFriends.qml diff --git a/ui/views/App/Main/MainWindow.js b/linphone-desktop/ui/views/App/Main/MainWindow.js similarity index 100% rename from ui/views/App/Main/MainWindow.js rename to linphone-desktop/ui/views/App/Main/MainWindow.js diff --git a/ui/views/App/Main/MainWindow.qml b/linphone-desktop/ui/views/App/Main/MainWindow.qml similarity index 100% rename from ui/views/App/Main/MainWindow.qml rename to linphone-desktop/ui/views/App/Main/MainWindow.qml diff --git a/ui/views/App/Main/MainWindowMenuBar.qml b/linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml similarity index 100% rename from ui/views/App/Main/MainWindowMenuBar.qml rename to linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml diff --git a/ui/views/App/Main/MainWindowTopMenuBar.qml b/linphone-desktop/ui/views/App/Main/MainWindowTopMenuBar.qml similarity index 100% rename from ui/views/App/Main/MainWindowTopMenuBar.qml rename to linphone-desktop/ui/views/App/Main/MainWindowTopMenuBar.qml diff --git a/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.js b/linphone-desktop/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.js similarity index 100% rename from ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.js rename to linphone-desktop/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.js diff --git a/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.qml b/linphone-desktop/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.qml similarity index 100% rename from ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.qml rename to linphone-desktop/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.qml diff --git a/ui/views/App/Settings/Dialogs/SettingsVideoPreview.qml b/linphone-desktop/ui/views/App/Settings/Dialogs/SettingsVideoPreview.qml similarity index 100% rename from ui/views/App/Settings/Dialogs/SettingsVideoPreview.qml rename to linphone-desktop/ui/views/App/Settings/Dialogs/SettingsVideoPreview.qml diff --git a/ui/views/App/Settings/SettingsAdvanced.js b/linphone-desktop/ui/views/App/Settings/SettingsAdvanced.js similarity index 100% rename from ui/views/App/Settings/SettingsAdvanced.js rename to linphone-desktop/ui/views/App/Settings/SettingsAdvanced.js diff --git a/ui/views/App/Settings/SettingsAdvanced.qml b/linphone-desktop/ui/views/App/Settings/SettingsAdvanced.qml similarity index 100% rename from ui/views/App/Settings/SettingsAdvanced.qml rename to linphone-desktop/ui/views/App/Settings/SettingsAdvanced.qml diff --git a/ui/views/App/Settings/SettingsAudio.qml b/linphone-desktop/ui/views/App/Settings/SettingsAudio.qml similarity index 100% rename from ui/views/App/Settings/SettingsAudio.qml rename to linphone-desktop/ui/views/App/Settings/SettingsAudio.qml diff --git a/ui/views/App/Settings/SettingsCallsChat.qml b/linphone-desktop/ui/views/App/Settings/SettingsCallsChat.qml similarity index 100% rename from ui/views/App/Settings/SettingsCallsChat.qml rename to linphone-desktop/ui/views/App/Settings/SettingsCallsChat.qml diff --git a/ui/views/App/Settings/SettingsNetwork.qml b/linphone-desktop/ui/views/App/Settings/SettingsNetwork.qml similarity index 100% rename from ui/views/App/Settings/SettingsNetwork.qml rename to linphone-desktop/ui/views/App/Settings/SettingsNetwork.qml diff --git a/ui/views/App/Settings/SettingsSipAccounts.js b/linphone-desktop/ui/views/App/Settings/SettingsSipAccounts.js similarity index 100% rename from ui/views/App/Settings/SettingsSipAccounts.js rename to linphone-desktop/ui/views/App/Settings/SettingsSipAccounts.js diff --git a/ui/views/App/Settings/SettingsSipAccounts.qml b/linphone-desktop/ui/views/App/Settings/SettingsSipAccounts.qml similarity index 100% rename from ui/views/App/Settings/SettingsSipAccounts.qml rename to linphone-desktop/ui/views/App/Settings/SettingsSipAccounts.qml diff --git a/ui/views/App/Settings/SettingsUi.js b/linphone-desktop/ui/views/App/Settings/SettingsUi.js similarity index 100% rename from ui/views/App/Settings/SettingsUi.js rename to linphone-desktop/ui/views/App/Settings/SettingsUi.js diff --git a/ui/views/App/Settings/SettingsUi.qml b/linphone-desktop/ui/views/App/Settings/SettingsUi.qml similarity index 100% rename from ui/views/App/Settings/SettingsUi.qml rename to linphone-desktop/ui/views/App/Settings/SettingsUi.qml diff --git a/ui/views/App/Settings/SettingsVideo.js b/linphone-desktop/ui/views/App/Settings/SettingsVideo.js similarity index 100% rename from ui/views/App/Settings/SettingsVideo.js rename to linphone-desktop/ui/views/App/Settings/SettingsVideo.js diff --git a/ui/views/App/Settings/SettingsVideo.qml b/linphone-desktop/ui/views/App/Settings/SettingsVideo.qml similarity index 100% rename from ui/views/App/Settings/SettingsVideo.qml rename to linphone-desktop/ui/views/App/Settings/SettingsVideo.qml diff --git a/ui/views/App/Settings/SettingsWindow.qml b/linphone-desktop/ui/views/App/Settings/SettingsWindow.qml similarity index 100% rename from ui/views/App/Settings/SettingsWindow.qml rename to linphone-desktop/ui/views/App/Settings/SettingsWindow.qml diff --git a/ui/views/App/Styles/Calls/CallStyle.qml b/linphone-desktop/ui/views/App/Styles/Calls/CallStyle.qml similarity index 100% rename from ui/views/App/Styles/Calls/CallStyle.qml rename to linphone-desktop/ui/views/App/Styles/Calls/CallStyle.qml diff --git a/ui/views/App/Styles/Calls/CallsWindowStyle.qml b/linphone-desktop/ui/views/App/Styles/Calls/CallsWindowStyle.qml similarity index 100% rename from ui/views/App/Styles/Calls/CallsWindowStyle.qml rename to linphone-desktop/ui/views/App/Styles/Calls/CallsWindowStyle.qml diff --git a/ui/views/App/Styles/Calls/ConferenceStyle.qml b/linphone-desktop/ui/views/App/Styles/Calls/ConferenceStyle.qml similarity index 100% rename from ui/views/App/Styles/Calls/ConferenceStyle.qml rename to linphone-desktop/ui/views/App/Styles/Calls/ConferenceStyle.qml diff --git a/ui/views/App/Styles/Calls/Dialogs/CallSipAddressStyle.qml b/linphone-desktop/ui/views/App/Styles/Calls/Dialogs/CallSipAddressStyle.qml similarity index 100% rename from ui/views/App/Styles/Calls/Dialogs/CallSipAddressStyle.qml rename to linphone-desktop/ui/views/App/Styles/Calls/Dialogs/CallSipAddressStyle.qml diff --git a/ui/views/App/Styles/Calls/Dialogs/CallTransferStyle.qml b/linphone-desktop/ui/views/App/Styles/Calls/Dialogs/CallTransferStyle.qml similarity index 100% rename from ui/views/App/Styles/Calls/Dialogs/CallTransferStyle.qml rename to linphone-desktop/ui/views/App/Styles/Calls/Dialogs/CallTransferStyle.qml diff --git a/ui/views/App/Styles/Calls/Dialogs/ConferenceManagerStyle.qml b/linphone-desktop/ui/views/App/Styles/Calls/Dialogs/ConferenceManagerStyle.qml similarity index 100% rename from ui/views/App/Styles/Calls/Dialogs/ConferenceManagerStyle.qml rename to linphone-desktop/ui/views/App/Styles/Calls/Dialogs/ConferenceManagerStyle.qml diff --git a/ui/views/App/Styles/Calls/Dialogs/MultimediaParametersStyle.qml b/linphone-desktop/ui/views/App/Styles/Calls/Dialogs/MultimediaParametersStyle.qml similarity index 100% rename from ui/views/App/Styles/Calls/Dialogs/MultimediaParametersStyle.qml rename to linphone-desktop/ui/views/App/Styles/Calls/Dialogs/MultimediaParametersStyle.qml diff --git a/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithEmailStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithEmailStyle.qml similarity index 100% rename from ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithEmailStyle.qml rename to linphone-desktop/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithEmailStyle.qml diff --git a/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithPhoneNumberStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithPhoneNumberStyle.qml similarity index 100% rename from ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithPhoneNumberStyle.qml rename to linphone-desktop/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithPhoneNumberStyle.qml diff --git a/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml similarity index 100% rename from ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml rename to linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml diff --git a/ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml similarity index 100% rename from ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml rename to linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml diff --git a/ui/views/App/Styles/Main/Assistant/CreateAppSipAccountStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/Assistant/CreateAppSipAccountStyle.qml similarity index 100% rename from ui/views/App/Styles/Main/Assistant/CreateAppSipAccountStyle.qml rename to linphone-desktop/ui/views/App/Styles/Main/Assistant/CreateAppSipAccountStyle.qml diff --git a/ui/views/App/Styles/Main/Assistant/UseAppSipAccountStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/Assistant/UseAppSipAccountStyle.qml similarity index 100% rename from ui/views/App/Styles/Main/Assistant/UseAppSipAccountStyle.qml rename to linphone-desktop/ui/views/App/Styles/Main/Assistant/UseAppSipAccountStyle.qml diff --git a/ui/views/App/Styles/Main/AssistantStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/AssistantStyle.qml similarity index 100% rename from ui/views/App/Styles/Main/AssistantStyle.qml rename to linphone-desktop/ui/views/App/Styles/Main/AssistantStyle.qml diff --git a/ui/views/App/Styles/Main/ContactEditStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/ContactEditStyle.qml similarity index 100% rename from ui/views/App/Styles/Main/ContactEditStyle.qml rename to linphone-desktop/ui/views/App/Styles/Main/ContactEditStyle.qml diff --git a/ui/views/App/Styles/Main/ContactsStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/ContactsStyle.qml similarity index 100% rename from ui/views/App/Styles/Main/ContactsStyle.qml rename to linphone-desktop/ui/views/App/Styles/Main/ContactsStyle.qml diff --git a/ui/views/App/Styles/Main/ConversationStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/ConversationStyle.qml similarity index 100% rename from ui/views/App/Styles/Main/ConversationStyle.qml rename to linphone-desktop/ui/views/App/Styles/Main/ConversationStyle.qml diff --git a/ui/views/App/Styles/Main/Dialogs/AboutStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/Dialogs/AboutStyle.qml similarity index 100% rename from ui/views/App/Styles/Main/Dialogs/AboutStyle.qml rename to linphone-desktop/ui/views/App/Styles/Main/Dialogs/AboutStyle.qml diff --git a/ui/views/App/Styles/Main/Dialogs/AuthenticationRequestStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/Dialogs/AuthenticationRequestStyle.qml similarity index 100% rename from ui/views/App/Styles/Main/Dialogs/AuthenticationRequestStyle.qml rename to linphone-desktop/ui/views/App/Styles/Main/Dialogs/AuthenticationRequestStyle.qml diff --git a/ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml similarity index 100% rename from ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml rename to linphone-desktop/ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml diff --git a/ui/views/App/Styles/Main/HomeStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/HomeStyle.qml similarity index 100% rename from ui/views/App/Styles/Main/HomeStyle.qml rename to linphone-desktop/ui/views/App/Styles/Main/HomeStyle.qml diff --git a/ui/views/App/Styles/Main/InviteFriendsStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/InviteFriendsStyle.qml similarity index 100% rename from ui/views/App/Styles/Main/InviteFriendsStyle.qml rename to linphone-desktop/ui/views/App/Styles/Main/InviteFriendsStyle.qml diff --git a/ui/views/App/Styles/Main/MainWindowStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/MainWindowStyle.qml similarity index 100% rename from ui/views/App/Styles/Main/MainWindowStyle.qml rename to linphone-desktop/ui/views/App/Styles/Main/MainWindowStyle.qml diff --git a/ui/views/App/Styles/Settings/Dialogs/SettingsSipAccountsEditStyle.qml b/linphone-desktop/ui/views/App/Styles/Settings/Dialogs/SettingsSipAccountsEditStyle.qml similarity index 100% rename from ui/views/App/Styles/Settings/Dialogs/SettingsSipAccountsEditStyle.qml rename to linphone-desktop/ui/views/App/Styles/Settings/Dialogs/SettingsSipAccountsEditStyle.qml diff --git a/ui/views/App/Styles/Settings/Dialogs/SettingsVideoPreviewStyle.qml b/linphone-desktop/ui/views/App/Styles/Settings/Dialogs/SettingsVideoPreviewStyle.qml similarity index 100% rename from ui/views/App/Styles/Settings/Dialogs/SettingsVideoPreviewStyle.qml rename to linphone-desktop/ui/views/App/Styles/Settings/Dialogs/SettingsVideoPreviewStyle.qml diff --git a/ui/views/App/Styles/Settings/SettingsAdvancedStyle.qml b/linphone-desktop/ui/views/App/Styles/Settings/SettingsAdvancedStyle.qml similarity index 100% rename from ui/views/App/Styles/Settings/SettingsAdvancedStyle.qml rename to linphone-desktop/ui/views/App/Styles/Settings/SettingsAdvancedStyle.qml diff --git a/ui/views/App/Styles/Settings/SettingsAudioStyle.qml b/linphone-desktop/ui/views/App/Styles/Settings/SettingsAudioStyle.qml similarity index 100% rename from ui/views/App/Styles/Settings/SettingsAudioStyle.qml rename to linphone-desktop/ui/views/App/Styles/Settings/SettingsAudioStyle.qml diff --git a/ui/views/App/Styles/Settings/SettingsWindowStyle.qml b/linphone-desktop/ui/views/App/Styles/Settings/SettingsWindowStyle.qml similarity index 100% rename from ui/views/App/Styles/Settings/SettingsWindowStyle.qml rename to linphone-desktop/ui/views/App/Styles/Settings/SettingsWindowStyle.qml diff --git a/ui/views/App/Styles/qmldir b/linphone-desktop/ui/views/App/Styles/qmldir similarity index 100% rename from ui/views/App/Styles/qmldir rename to linphone-desktop/ui/views/App/Styles/qmldir diff --git a/prepare.py b/prepare.py deleted file mode 100755 index a0ff25018..000000000 --- a/prepare.py +++ /dev/null @@ -1,271 +0,0 @@ -#!/usr/bin/env python - -############################################################################ -# prepare.py -# Copyright (C) 2015-2018 Belledonne Communications, Grenoble France -# -############################################################################ -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -############################################################################ - -import os -import platform -import sys -from logging import error, warning, info -from subprocess import Popen -sys.dont_write_bytecode = True -sys.path.insert(0, 'linphone-sdk/cmake-builder') -try: - import prepare -except Exception as e: - error( - "Could not find prepare module: {}, probably missing linphone-sdk/cmake-builder? Try running:\n" - "git submodule sync && git submodule update --init --recursive".format(e)) - exit(1) - - - -class DesktopTarget(prepare.Target): - - def __init__(self, group_builders=False): - prepare.Target.__init__(self, 'desktop') - current_path = os.path.dirname(os.path.realpath(__file__)) - self.config_file = 'configs/config-desktop.cmake' - self.output = 'OUTPUT/' + self.name - self.external_source_path = os.path.join(current_path, 'linphone-sdk') - self.alternate_external_source_path = os.path.join(current_path, 'submodules') - self.packaging_args = [ - "-DENABLE_RELATIVE_PREFIX=YES" - ] - external_builders_path = os.path.join(current_path, 'cmake_builder') - self.additional_args = [ - "-DLINPHONE_BUILDER_EXTERNAL_BUILDERS_PATH=" + external_builders_path, - "-DLINPHONE_BUILDER_TARGET=linphoneqt" - ] - - -class DesktopRaspberryTarget(prepare.Target): - - def __init__(self, group_builders=False): - prepare.Target.__init__(self, 'desktop-raspberry') - current_path = os.path.dirname(os.path.realpath(__file__)) - self.required_build_platforms = ['Linux'] - self.config_file = 'configs/config-desktop-raspberry.cmake' - self.toolchain_file = 'toolchains/toolchain-raspberry.cmake' - self.output = 'OUTPUT/' + self.name - self.external_source_path = os.path.join(current_path, 'linphone-sdk') - self.alternate_external_source_path = os.path.join(current_path, 'submodules') - self.packaging_args = [ - "-DCMAKE_INSTALL_RPATH=$ORIGIN/../lib", - "-DENABLE_RELATIVE_PREFIX=YES" - ] - - -class DesktopRpmTarget(prepare.Target): - - def __init__(self, group_builders=False): - prepare.Target.__init__(self, 'desktop-rpm') - current_path = os.path.dirname(os.path.realpath(__file__)) - self.config_file = 'configs/config-desktop-rpm.cmake' - self.output = 'OUTPUT/' + self.name - self.external_source_path = os.path.join(current_path, 'linphone-sdk') - self.alternate_external_source_path = os.path.join(current_path, 'submodules') - external_builders_path = os.path.join(current_path, 'cmake_builder') - self.additional_args = [ - "-DLINPHONE_BUILDER_EXTERNAL_BUILDERS_PATH=" + external_builders_path, - "-DLINPHONE_BUILDER_TARGET=linphoneqt" - ] - - -class NoUITarget(prepare.Target): - - def __init__(self, group_builders=False): - prepare.Target.__init__(self, 'no-ui') - current_path = os.path.dirname(os.path.realpath(__file__)) - self.config_file = 'configs/config-desktop.cmake' - self.output = 'OUTPUT/' + self.name - self.external_source_path = os.path.join(current_path, 'linphone-sdk') - self.alternate_external_source_path = os.path.join(current_path, 'submodules') - self.packaging_args = [ - "-DCMAKE_INSTALL_RPATH=$ORIGIN/../lib", - "-DENABLE_RELATIVE_PREFIX=YES", - "-DENABLE_CXX_WRAPPER=OFF" - ] - - - - -class PythonTarget(prepare.Target): - - def __init__(self): - prepare.Target.__init__(self, 'python') - current_path = os.path.dirname(os.path.realpath(__file__)) - self.config_file = 'configs/config-python.cmake' - self.output = 'OUTPUT/' + self.name - self.external_source_path = os.path.join(current_path, 'linphone-sdk') - self.alternate_external_source_path = os.path.join(current_path, 'submodules') - external_builders_path = os.path.join(current_path, 'cmake_builder') - self.additional_args += [ - "-DLINPHONE_BUILDER_EXTERNAL_BUILDERS_PATH=" + external_builders_path, - "-DLINPHONE_BUILDER_PYTHON_VERSION={}.{}".format(sys.version_info.major, sys.version_info.minor) - ] - - -class PythonRaspberryTarget(prepare.Target): - - def __init__(self): - prepare.Target.__init__(self, 'python-raspberry') - current_path = os.path.dirname(os.path.realpath(__file__)) - self.required_build_platforms = ['Linux'] - self.config_file = 'configs/config-python-raspberry.cmake' - self.toolchain_file = 'toolchains/toolchain-raspberry.cmake' - self.output = 'OUTPUT/' + self.name - self.external_source_path = os.path.join(current_path, 'linphone-sdk') - self.alternate_external_source_path = os.path.join(current_path, 'submodules') - - - -desktop_targets = { - 'desktop': DesktopTarget(), - 'desktop-raspberry': DesktopRaspberryTarget(), - 'desktop-rpm': DesktopRpmTarget(), - 'no-ui' : NoUITarget(), - 'python': PythonTarget(), - 'python-raspberry': PythonRaspberryTarget() -} - -class DesktopPreparator(prepare.Preparator): - - def __init__(self, targets=desktop_targets, default_targets=['desktop']): - prepare.Preparator.__init__(self, targets, default_targets) - self.veryclean = True - self.argparser.add_argument('-ac', '--all-codecs', help="Enable all codecs, including the non-free ones", action='store_true') - self.argparser.add_argument('-sys', '--use-system-dependencies', help="Find dependencies on the system.", action='store_true') - self.argparser.add_argument('-p', '--package', help="Build an installation package (only on Mac OSX and Windows).", action='store_true') - self.argparser.add_argument('-ps', '--package-source', help="Build source packages for the dependencies.", action='store_true') - - def parse_args(self): - prepare.Preparator.parse_args(self) - - if self.args.use_system_dependencies: - self.additional_args += ["-DLINPHONE_BUILDER_USE_SYSTEM_DEPENDENCIES=YES"] - - if self.args.all_codecs: - self.additional_args += ["-DENABLE_GPL_THIRD_PARTIES=YES"] - self.additional_args += ["-DENABLE_NON_FREE_CODECS=YES"] - self.additional_args += ["-DENABLE_AMRNB=YES"] - self.additional_args += ["-DENABLE_AMRWB=YES"] - self.additional_args += ["-DENABLE_G729=YES"] - self.additional_args += ["-DENABLE_GSM=YES"] - self.additional_args += ["-DENABLE_ILBC=YES"] - self.additional_args += ["-DENABLE_ISAC=YES"] - self.additional_args += ["-DENABLE_OPUS=YES"] - self.additional_args += ["-DENABLE_SILK=YES"] - self.additional_args += ["-DENABLE_SPEEX=YES"] - self.additional_args += ["-DENABLE_FFMPEG=YES"] - self.additional_args += ["-DENABLE_H263=YES"] - self.additional_args += ["-DENABLE_H263P=YES"] - self.additional_args += ["-DENABLE_MPEG4=YES"] - self.additional_args += ["-DENABLE_OPENH264=YES"] - self.additional_args += ["-DENABLE_VPX=YES"] - - def check_environment(self): - ret = prepare.Preparator.check_environment(self) - - if "no-ui" in self.targets: - return ret - if platform.system() == 'Windows': - ret |= not self.check_is_installed('mingw-get', 'MinGW (https://sourceforge.net/projects/mingw/files/Installer/)') - if platform.system() == 'Windows': - doxygen_prog = 'doxygen (http://www.stack.nl/~dimitri/doxygen/download.html)' - graphviz_prog = 'graphviz (http://www.graphviz.org/download/)' - else: - doxygen_prog = 'doxygen' - graphviz_prog = 'graphviz' - ret |= not self.check_is_installed('doxygen', doxygen_prog) - ret |= not self.check_is_installed('dot', graphviz_prog) - ret |= not self.check_python_module_is_present('pystache') - ret |= not self.check_python_module_is_present('six') - if "python" in self.args.target or "python-raspberry" in self.args.target: - ret |= not self.check_python_module_is_present('wheel') - - return ret - - def show_missing_dependencies(self): - if self.missing_dependencies: - error("The following binaries are missing: {}. Please install these packages:\n\t{}".format( - " ".join(self.missing_dependencies.keys()), - " ".join(self.missing_dependencies.values()))) - - def clean(self): - prepare.Preparator.clean(self) - if os.path.isfile('Makefile'): - os.remove('Makefile') - if os.path.isdir('WORK') and not os.listdir('WORK'): - os.rmdir('WORK') - if os.path.isdir('OUTPUT') and not os.listdir('OUTPUT'): - os.rmdir('OUTPUT') - - def generate_makefile(self, generator, project_file=''): - targets = self.args.target - targets_str = "" - for target in targets: - targets_str += """ -{target}: {target}-build - -{target}-build: -\t{generator} WORK/{target}/cmake/{project_file} -\t@echo "Done" -""".format(target=target, generator=generator, project_file=project_file) - makefile = """ -targets={targets} - -.PHONY: all - -all: build - -build: $(addsuffix -build, $(targets)) - -{targets_str} - -help-prepare-options: -\t@echo "prepare.py was previously executed with the following options:" -\t@echo " ./prepare.py {options}" - -help: help-prepare-options -\t@echo "" -\t@echo "(please read the README.md file first)" -\t@echo "" -\t@echo "Available targets: {targets}" -\t@echo "" -""".format(targets=' '.join(targets), targets_str=targets_str, options=' '.join(self.argv), generator=generator) - f = open('Makefile', 'w') - f.write(makefile) - f.close() - - - -def main(): - preparator = DesktopPreparator() - preparator.parse_args() - if preparator.check_environment() != 0: - preparator.show_environment_errors() - return 1 - return preparator.run() - -if __name__ == "__main__": - sys.exit(main()) From 14d3fd936b55d35e65f6977e69735c79f876a031 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Tue, 24 Mar 2020 22:54:39 +0100 Subject: [PATCH 02/20] Build change --- CHANGELOG.md | 2 +- CMakeLists.txt | 544 +++--------------- README.md | 20 +- linphone-desktop/CMakeLists.txt | 515 +++++++++++++++++ linphone-desktop/cmake_builder/CMakeLists.txt | 497 +++++++++++++++- .../linphone_package/CMakeLists.txt | 236 ++++---- .../linphone_package/macos/packaging.cmake.in | 31 - .../linphone_package/packaging.cmake.in | 70 +++ .../windows/packaging.cmake.in | 41 -- linphone-sdk | 2 +- 10 files changed, 1295 insertions(+), 663 deletions(-) create mode 100644 linphone-desktop/CMakeLists.txt delete mode 100644 linphone-desktop/cmake_builder/linphone_package/macos/packaging.cmake.in create mode 100644 linphone-desktop/cmake_builder/linphone_package/packaging.cmake.in delete mode 100644 linphone-desktop/cmake_builder/linphone_package/windows/packaging.cmake.in diff --git a/CHANGELOG.md b/CHANGELOG.md index aeeb17877..1386f6a78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,7 +22,7 @@ - Add caller/callee on saved files. - Supports totally french, english, portuguese, russian, turkish, ukrainian. - App Nap avoiding for MacOs - +- Simplify building process ### Fixes diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ee774410..d914c67a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,30 +20,32 @@ # ################################################################################ -# First building command: -# cmake .. && cmake --build . --target all --parallel 10 && cmake --build . --target install && cmake .. -# Logic : Prepare first building of the SDK and Minizip. Install binaries and prepare for application building. -# Next, we can build the application with cmake --build . --target all --parallel 10 && cmake --build . --target install - cmake_minimum_required(VERSION 3.1) + +get_cmake_property(vars CACHE_VARIABLES) +foreach(var ${vars}) + get_property(currentHelpString CACHE "${var}" PROPERTY HELPSTRING) + if("${currentHelpString}" MATCHES "No help, variable specified on the command line." OR "${currentHelpString}" STREQUAL "") + # message("${var} = [${${var}}] -- ${currentHelpString}") # uncomment to see the variables being processed + list(APPEND USER_ARGS "-D${var}=${${var}}") + endif() +endforeach() + project(linphoneqt VERSION 4.1.1) +include(GNUInstallDirs) +include(CheckCXXCompilerFlag) + # Prepare gobal CMAKE configuration specific to the current project set(SDK_BUILD_DIR "${CMAKE_BINARY_DIR}/WORK") # SDK build in WORK. Keep all in it. -set(LINPHONE_OUTPUT_DIR "${CMAKE_BINARY_DIR}/linphone-sdk/desktop") #This is fixed by the SDK +set(LINPHONE_OUTPUT_DIR "${CMAKE_BINARY_DIR}/linphone-sdk/desktop") +set(MINIZIP_BUILD_DIR "${CMAKE_BINARY_DIR}/minizip_BUILD") set(MINIZIP_OUTPUT_DIR "${CMAKE_BINARY_DIR}/minizip_OUTPUT") - set(APPLICATION_OUTPUT_DIR "${CMAKE_BINARY_DIR}/OUTPUT") - message("minizip=${MINIZIP_OUTPUT_DIR} sdk=${LINPHONE_OUTPUT_DIR}") +#list(APPEND CMAKE_PREFIX_PATH "${LINPHONE_OUTPUT_DIR};${MINIZIP_OUTPUT_DIR};${APPLICATION_OUTPUT_DIR}") +set(PREFIX_PATH "${LINPHONE_OUTPUT_DIR}|${MINIZIP_OUTPUT_DIR}|${APPLICATION_OUTPUT_DIR}") -list(APPEND CMAKE_PREFIX_PATH "${LINPHONE_OUTPUT_DIR};${MINIZIP_OUTPUT_DIR};${APPLICATION_OUTPUT_DIR}") - -if(UNIX AND NOT APPLE) - set(CMAKE_INSTALL_RPATH "$ORIGIN;$ORIGIN/lib64;$ORIGIN/../lib64;$ORIGIN/lib;$ORIGIN/../lib") - set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -endif() -list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") # Avoid cmake warning if CMP0071 is not set. if (POLICY CMP0071) cmake_policy(SET CMP0071 NEW) @@ -52,18 +54,21 @@ endif () #------------------------------------------------------------------------------ -set(APP_LIBRARY app-library) -include(application_info.cmake) +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + message(STATUS "Setting build type to 'RelWithDebInfo' as none was specified") + set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo" FORCE) + # Set the available build type values for cmake-gui + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "RelWithDebInfo") +endif() # ------------------------------------------------------------------------------ -set(TARGET_NAME linphone-qt) -set(CMAKE_CXX_STANDARD 11) #------------------------------------------------------------------------------- # SET OPTIONS #------------------------------------------------------------------------------- +option(ENABLE_PACKAGING "Enable packaging" NO) option(ENABLE_UPDATE_CHECK "Enable update check." NO) option(ENABLE_UNIT_TESTS "Enable unit test of SDK." NO ) option(ENABLE_TESTS "Build with testing binaries of SDK" NO ) @@ -81,443 +86,70 @@ endif() option(ENABLE_RELATIVE_PREFIX "Set Internal packages relative to the binary" YES) -include(GNUInstallDirs) -include(CheckCXXCompilerFlag) +set(ALL_OPTIONS "-DENABLE_UPDATE_CHECK=${ENABLE_UPDATE_CHECK}") +list(APPEND ALL_OPTIONS "-DENABLE_PACKAGING=${ENABLE_PACKAGING}") +list(APPEND ALL_OPTIONS "-DENABLE_UNIT_TESTS=${ENABLE_UNIT_TESTS}") +list(APPEND ALL_OPTIONS "-DENABLE_TESTS=${ENABLE_TESTS}") +list(APPEND ALL_OPTIONS "-DENABLE_TESTS_COMPONENTS=${ENABLE_TESTS_COMPONENTS}") +list(APPEND ALL_OPTIONS "-DENABLE_TOOLS=${ENABLE_TOOLS}") +list(APPEND ALL_OPTIONS "-DENABLE_STRICT=${ENABLE_STRICT}") +list(APPEND ALL_OPTIONS "-DENABLE_FFMPEG=${ENABLE_FFMPEG}") +list(APPEND ALL_OPTIONS "-DENABLE_OPUS=${ENABLE_OPUS}") +if(ENABLE_V4L) + list(APPEND ALL_OPTIONS "-DENABLE_V4L=${ENABLE_V4L}") +endif() + +list(APPEND ALL_OPTIONS "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}") +list(APPEND ALL_OPTIONS "-DLINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}") -find_package(LinphoneCxx CONFIG) -find_package(Linphone CONFIG) -find_package(bctoolbox CONFIG) -find_package(belcard CONFIG) -find_package(Mediastreamer2 CONFIG) -find_package(ortp CONFIG) - -if( NOT (LinphoneCxx_FOUND) OR NOT (Linphone_FOUND) OR NOT (bctoolbox_FOUND) OR NOT (belcard_FOUND) OR NOT (Mediastreamer2_FOUND) OR NOT (ortp_FOUND)) - message("Linphone packages are not installed. Build and install it in order to build Minizip and then Desktop Application.") - set(CMAKE_INSTALL_PREFIX "${LINPHONE_OUTPUT_DIR}") - add_subdirectory("linphone-sdk" "${SDK_BUILD_DIR}") -elseif( APP_FORCE_SDK_BUILD ) - set(CMAKE_INSTALL_PREFIX "${LINPHONE_OUTPUT_DIR}") - add_subdirectory("linphone-sdk" "${SDK_BUILD_DIR}") +include(ExternalProject) +if(${CMAKE_VERSION} VERSION_LESS "3.12.0") + set(PROJECT_BUILD_COMMAND "") else() - # Linphone SDK has been builded - message("LINPHONECXX : ${LINPHONECXX_INCLUDE_DIRS} => ${LINPHONECXX_LIBRARIES}") - find_package(Minizip) - if( NOT(Minizip_FOUND)) - message("Minizip are not installed. Build and install it in order to build Desktop Application.") - set(CMAKE_INSTALL_PREFIX "${MINIZIP_OUTPUT_DIR}") - add_subdirectory(submodules/externals/minizip "submodules/externals/minizip/build-minizip") - else() - set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}") - if(WIN32) - set(EXECUTABLE_OUTPUT_DIR "${CMAKE_BINARY_DIR}") - set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${EXECUTABLE_OUTPUT_DIR}") - set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${EXECUTABLE_OUTPUT_DIR}") - set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${EXECUTABLE_OUTPUT_DIR}") - endif() - message("MINIZIP : ${MINIZIP_INCLUDE_DIRS} => ${MINIZIP_LIBRARIES}") - message("INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} FRAMEWORK_PATH=${CMAKE_FRAMEWORK_PATH}") - message("LINPHONE : ${LINPHONE_INCLUDE_DIRS} => ${LINPHONE_LIBRARIES}") - message("LINPHONECXX : ${LINPHONECXX_INCLUDE_DIRS} => ${LINPHONECXX_LIBRARIES}") + list(APPEND PROJECT_BUILD_COMMAND "--parallel" "10") +endif() - # Build configuration - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG -DQT_NO_DEBUG") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DQT_QML_DEBUG -DQT_DECLARATIVE_DEBUG") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG -DQT_QML_DEBUG -DQT_DECLARATIVE_DEBUG") - if( WIN32) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WINSOCKAPI_")#remove error from windows headers order - endif() - set(CMAKE_INCLUDE_CURRENT_DIR ON)#useful for config.h - - set(QT5_PACKAGES Core Gui Quick Widgets QuickControls2 Svg LinguistTools Concurrent Network) - if (UNIX AND NOT APPLE) - list(APPEND QT5_PACKAGES DBus) - endif () - set(QT5_PACKAGES_OPTIONAL TextToSpeech) - set(CMAKE_AUTOMOC ON) - #------------------------------------------------- - set(ASSETS_DIR "assets") - set(SOURCES - src/app/App.cpp - src/app/AppController.cpp - src/app/cli/Cli.cpp - src/app/logger/Logger.cpp - src/app/paths/Paths.cpp - src/app/providers/AvatarProvider.cpp - src/app/providers/ImageProvider.cpp - src/app/providers/ThumbnailProvider.cpp - src/app/translator/DefaultTranslator.cpp - src/components/assistant/AssistantModel.cpp - src/components/authentication/AuthenticationNotifier.cpp - src/components/call/CallModel.cpp - src/components/calls/CallsListModel.cpp - src/components/calls/CallsListProxyModel.cpp - src/components/camera/Camera.cpp - src/components/camera/CameraPreview.cpp - src/components/camera/MSFunctions.cpp - src/components/chat/ChatModel.cpp - src/components/chat/ChatProxyModel.cpp - src/components/codecs/AbstractCodecsModel.cpp - src/components/codecs/AudioCodecsModel.cpp - src/components/codecs/VideoCodecsModel.cpp - src/components/conference/ConferenceAddModel.cpp - src/components/conference/ConferenceHelperModel.cpp - src/components/conference/ConferenceModel.cpp - src/components/contact/ContactModel.cpp - src/components/contact/VcardModel.cpp - src/components/contacts/ContactsListModel.cpp - src/components/contacts/ContactsListProxyModel.cpp - src/components/core/CoreHandlers.cpp - src/components/core/CoreManager.cpp - src/components/core/event-count-notifier/AbstractEventCountNotifier.cpp - src/components/file/FileDownloader.cpp - src/components/file/FileExtractor.cpp - src/components/notifier/Notifier.cpp - src/components/other/clipboard/Clipboard.cpp - src/components/other/colors/Colors.cpp - src/components/other/text-to-speech/TextToSpeech.cpp - src/components/other/units/Units.cpp - src/components/presence/OwnPresenceModel.cpp - src/components/presence/Presence.cpp - src/components/settings/AccountSettingsModel.cpp - src/components/settings/SettingsModel.cpp - src/components/sip-addresses/SipAddressesModel.cpp - src/components/sip-addresses/SipAddressesProxyModel.cpp - src/components/sip-addresses/SipAddressObserver.cpp - src/components/sound-player/SoundPlayer.cpp - src/components/telephone-numbers/TelephoneNumbersModel.cpp - src/components/timeline/TimelineModel.cpp - src/components/url-handlers/UrlHandlers.cpp - src/utils/LinphoneUtils.cpp - src/utils/MediastreamerUtils.cpp - src/utils/QExifImageHeader.cpp - src/utils/Utils.cpp - ) - - set(HEADERS - src/app/App.hpp - src/app/AppController.hpp - src/app/cli/Cli.hpp - src/app/logger/Logger.hpp - src/app/paths/Paths.hpp - src/app/providers/AvatarProvider.hpp - src/app/providers/ImageProvider.hpp - src/app/providers/ThumbnailProvider.hpp - src/app/single-application/SingleApplication.hpp - src/app/translator/DefaultTranslator.hpp - src/components/assistant/AssistantModel.hpp - src/components/authentication/AuthenticationNotifier.hpp - src/components/call/CallModel.hpp - src/components/calls/CallsListModel.hpp - src/components/calls/CallsListProxyModel.hpp - src/components/camera/Camera.hpp - src/components/camera/CameraPreview.hpp - src/components/camera/MSFunctions.hpp - src/components/chat/ChatModel.hpp - src/components/chat/ChatProxyModel.hpp - src/components/codecs/AbstractCodecsModel.hpp - src/components/codecs/AudioCodecsModel.hpp - src/components/codecs/VideoCodecsModel.hpp - src/components/Components.hpp - src/components/conference/ConferenceAddModel.hpp - src/components/conference/ConferenceHelperModel.hpp - src/components/conference/ConferenceModel.hpp - src/components/contact/ContactModel.hpp - src/components/contact/VcardModel.hpp - src/components/contacts/ContactsListModel.hpp - src/components/contacts/ContactsListProxyModel.hpp - src/components/core/CoreHandlers.hpp - src/components/core/CoreManager.hpp - src/components/core/event-count-notifier/AbstractEventCountNotifier.hpp - src/components/file/FileDownloader.hpp - src/components/file/FileExtractor.hpp - src/components/notifier/Notifier.hpp - src/components/other/clipboard/Clipboard.hpp - src/components/other/colors/Colors.hpp - src/components/other/desktop-tools/DesktopTools.hpp - src/components/other/text-to-speech/TextToSpeech.hpp - src/components/other/units/Units.hpp - src/components/presence/OwnPresenceModel.hpp - src/components/presence/Presence.hpp - src/components/settings/AccountSettingsModel.hpp - src/components/settings/SettingsModel.hpp - src/components/sip-addresses/SipAddressesModel.hpp - src/components/sip-addresses/SipAddressesProxyModel.hpp - src/components/sip-addresses/SipAddressObserver.hpp - src/components/sound-player/SoundPlayer.hpp - src/components/telephone-numbers/TelephoneNumbersModel.hpp - src/components/timeline/TimelineModel.hpp - src/components/url-handlers/UrlHandlers.hpp - src/utils/LinphoneUtils.hpp - src/utils/MediastreamerUtils.hpp - src/utils/QExifImageHeader.hpp - src/utils/Utils.hpp - ) - - set(MAIN_FILE src/app/main.cpp) - - if (APPLE) - list(APPEND SOURCES - src/app/single-application/SingleApplication.cpp - src/components/core/event-count-notifier/EventCountNotifierMacOs.m - src/components/other/desktop-tools/DesktopToolsMacOs.cpp - src/components/other/desktop-tools/screen-saver/ScreenSaverMacOs.m - src/components/other/desktop-tools/state-process/StateProcessMacOs.mm - ) - list(APPEND HEADERS - src/app/single-application/SingleApplicationPrivate.hpp - src/components/core/event-count-notifier/EventCountNotifierMacOs.hpp - src/components/other/desktop-tools/DesktopToolsMacOs.hpp - ) - elseif (WIN32) - list(APPEND SOURCES - src/app/single-application/SingleApplication.cpp - src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.cpp - src/components/other/desktop-tools/DesktopToolsWindows.cpp - ) - list(APPEND HEADERS - src/app/single-application/SingleApplicationPrivate.hpp - src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.hpp - src/components/other/desktop-tools/DesktopToolsWindows.hpp - ) - else () - list(APPEND SOURCES - src/app/single-application/SingleApplicationDBus.cpp - src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.cpp - src/components/other/desktop-tools/DesktopToolsLinux.cpp - src/components/other/desktop-tools/screen-saver/ScreenSaverDBus.cpp - src/components/other/desktop-tools/screen-saver/ScreenSaverXdg.cpp - ) - list(APPEND HEADERS - src/app/single-application/SingleApplicationDBusPrivate.hpp - src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.hpp - src/components/other/desktop-tools/DesktopToolsLinux.hpp - src/components/other/desktop-tools/screen-saver/ScreenSaverDBus.hpp - src/components/other/desktop-tools/screen-saver/ScreenSaverXdg.hpp - ) - endif () - - set(QRC_RESOURCES resources.qrc) - - set(LANGUAGES_DIRECTORY "${ASSETS_DIR}/languages") - set(I18N_FILENAME i18n.qrc) - set(LANGUAGES de en fr_FR ja lt ru sv tr pt_BR) - - # ------------------------------------------------------------------------------ - - function (PREPEND list prefix) - set(new_list "") - - foreach (elem ${${list}}) - list(APPEND new_list "${prefix}${elem}") - endforeach () - - set(${list} ${new_list} PARENT_SCOPE) - endfunction () - - # Force absolute paths. - PREPEND(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/") - PREPEND(HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/") - - # ------------------------------------------------------------------------------ - # Compute QML files list. - # ------------------------------------------------------------------------------ - - set(QML_SOURCES) - file(STRINGS ${QRC_RESOURCES} QRC_RESOURCES_CONTENT) - foreach (line ${QRC_RESOURCES_CONTENT}) - set(result) - string(REGEX REPLACE - "^[ \t]*<[ \t]*file[ \t]*>[ \t]*(.+\\.[a-z]+)[ \t]*<[ \t]*/[ \t]*file[ \t]*>[ \t]*$" - "\\1" - result - "${line}" - ) - string(REGEX MATCH "\\.[a-z]+$" is_ui ${result}) - if (NOT ${is_ui} STREQUAL "") - list(APPEND QML_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/${result}") - endif () - endforeach () - - # ------------------------------------------------------------------------------ - # Init git hooks. - # ------------------------------------------------------------------------------ - - if (NOT WIN32) - add_custom_target( - check_qml DEPENDS ${QML_SOURCES} - COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/tools/check_qml_syntax" - ) - endif() - - execute_process(COMMAND ${CMAKE_COMMAND} -E copy - "${CMAKE_CURRENT_SOURCE_DIR}/tools/private/pre-commit" - "${CMAKE_CURRENT_SOURCE_DIR}/.git/hooks/pre-commit" - ) - set(_QML_IMPORT_PATHS "") - list(APPEND _QML_IMPORT_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/ui/modules") - list(APPEND _QML_IMPORT_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/ui/dev-modules") - list(APPEND _QML_IMPORT_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/ui/scripts") - list(APPEND _QML_IMPORT_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/ui/views") - - - set(QML_IMPORT_PATH ${_QML_IMPORT_PATHS} CACHE STRING "Path used to locate CMake modules by Qt Creator" FORCE) - - - if(APPLE) - if(MS2_PLUGINS_LOCATION) - set(MSPLUGINS_DIR ${MS2_PLUGINS_LOCATION}) - else() - set(MSPLUGINS_DIR "Frameworks/mediastreamer2.framework/Versions/A/Libraries") - endif() - else() - set(MSPLUGINS_DIR "${CMAKE_INSTALL_LIBDIR}/mediastreamer/plugins") - endif() - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.cmake" "${CMAKE_CURRENT_BINARY_DIR}/config.h") - # ------------------------------------------------------------------------------ - # Build. - # ------------------------------------------------------------------------------ - - include_directories(src/) - - find_package(Qt5 COMPONENTS ${QT5_PACKAGES} REQUIRED) - find_package(Qt5 COMPONENTS ${QT5_PACKAGES_OPTIONAL} QUIET) - - if (CMAKE_INSTALL_RPATH) - #Retrieve lib path from a know QT executable - get_target_property(LUPDATE_PATH Qt5::lupdate LOCATION) - get_filename_component(LUPDATE_PATH "${LUPDATE_PATH}" DIRECTORY) - get_filename_component(QT_PATH "${LUPDATE_PATH}/../lib" ABSOLUTE) - list(APPEND CMAKE_INSTALL_RPATH "${QT_PATH}") - endif () - # Add languages support. - add_subdirectory(${LANGUAGES_DIRECTORY}) - - list(APPEND SOURCES "${CMAKE_CURRENT_BINARY_DIR}/${LANGUAGES_DIRECTORY}/${I18N_FILENAME}") - - # Build. - #add_library(${APP_LIBRARY} OBJECT ${SOURCES} ${HEADERS} ${RESOURCES} ${QML_SOURCES}) - add_library(${APP_LIBRARY} OBJECT ${SOURCES} ${HEADERS} ${QML_SOURCES} ${QRC_RESOURCES}) - set_property(TARGET ${APP_LIBRARY} PROPERTY POSITION_INDEPENDENT_CODE ON) - - #Turn on automatic resources compilation by cmake - #Instead of excplicitely calling qt5_add_resources - set_property(TARGET ${APP_LIBRARY} PROPERTY AUTORCC ON) - - bc_git_version(${TARGET_NAME} ${PROJECT_VERSION}) - add_dependencies(${APP_LIBRARY} ${TARGET_NAME}-git-version) - add_dependencies(${APP_LIBRARY} update_translations) - if (WIN32) - add_executable(${TARGET_NAME} WIN32 $ ${ASSETS_DIR}/app-icon.rc ${MAIN_FILE}) - else () - add_executable(${TARGET_NAME} $ ${MAIN_FILE}) - endif () - - set_target_properties(${TARGET_NAME} PROPERTIES OUTPUT_NAME "${EXECUTABLE_NAME}") - set(INCLUDED_DIRECTORIES "${LINPHONECXX_INCLUDE_DIRS}" "${LINPHONE_INCLUDE_DIRS}" "${BELCARD_INCLUDE_DIRS}" "${BCTOOLBOX_INCLUDE_DIRS}" "${MEDIASTREAMER2_INCLUDE_DIRS}" "${MINIZIP_INCLUDE_DIRS}") - set(LIBRARIES ${BCTOOLBOX_CORE_LIBRARIES} ${BELCARD_LIBRARIES} ${LINPHONE_LIBRARIES} ${LINPHONECXX_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES} ${ORTP_LIBRARIES} ${OPUS_LIBRARIES}) - if(WIN32) - list(APPEND LIBRARIES ${MINIZIP_LIBRARIES}) - endif() - foreach (package ${QT5_PACKAGES}) - list(APPEND INCLUDED_DIRECTORIES "${Qt5${package}_INCLUDE_DIRS}") - # `qt5_create_translation` is provided from `LinguistTools` package. - # But the `Qt5::LinguistTools` lib does not exist. Remove it. - if (NOT (${package} STREQUAL LinguistTools)) - list(APPEND LIBRARIES ${Qt5${package}_LIBRARIES}) - endif () - endforeach () - - foreach (package ${QT5_PACKAGES_OPTIONAL}) - if ("${Qt5${package}_FOUND}") - message("Optional package ${package} found.") - list(APPEND INCLUDED_DIRECTORIES "${Qt5${package}_INCLUDE_DIRS}") - list(APPEND LIBRARIES ${Qt5${package}_LIBRARIES}) - - string(TOUPPER "${package}" INCLUDE_NAME) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D${INCLUDE_NAME}_ENABLED") - else () - message("Optional package ${package} not found.") - endif () - endforeach () - - if (APPLE) - list(APPEND LIBRARIES "-framework Cocoa -framework IOKit") - # -framework linphone") #This doesn't work yet - endif () - target_include_directories(${APP_LIBRARY} SYSTEM PRIVATE ${INCLUDED_DIRECTORIES}) - target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${INCLUDED_DIRECTORIES}) - - target_link_libraries(${TARGET_NAME} ${LIBRARIES}) - if(WIN32) - target_link_libraries(${TARGET_NAME} wsock32 ws2_32) - endif() - - foreach (target ${TARGET_NAME}) - message("Available target : ${target}") - # install(TARGETS ${target} - # RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - # LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - # ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - # PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - # ) - endforeach () - - if (UNIX AND NOT APPLE) - # Install desktop/icon files. - configure_file("${ASSETS_DIR}/linphone.desktop.cmake" "${EXECUTABLE_NAME}.desktop" @ONLY) - - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE_NAME}.desktop" - DESTINATION "${CMAKE_INSTALL_DATADIR}/applications" - ) - install(FILES "${ASSETS_DIR}/images/linphone_logo.svg" - DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps/" - RENAME "${EXECUTABLE_NAME}.svg" - ) - - set(ICON_DIRS 16x16 22x22 24x24 32x32 64x64 128x128 256x256) - foreach (DIR ${ICON_DIRS}) - install(FILES "${ASSETS_DIR}/icons/hicolor/${DIR}/apps/icon.png" - DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/${DIR}/apps/" - RENAME "${EXECUTABLE_NAME}.png" - ) - endforeach () - endif () - - # ------------------------------------------------------------------------------ - # CPack settings & RPM. - # ------------------------------------------------------------------------------ - set(LINPHONE_DESKTOP_DIR "${CMAKE_SOURCE_DIR}") - set(LINPHONE_SDK_DIR "${CMAKE_BINARY_DIR}/linphone-sdk") - set(TOOLS_DIR "${CMAKE_BINARY_DIR}/programs") - set(LINPHONE_SOURCE_DIR ${EP_linphone_SOURCE_DIR}) - set(LINPHONE_BUILDER_SIGNING_IDENTITY ${LINPHONE_BUILDER_SIGNING_IDENTITY}) - set(LINPHONE_SDK_TMP "${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE_NAME}-sdk-tmp") - - add_subdirectory(build) - add_subdirectory(cmake_builder/linphone_package) - - # ------------------------------------------------------------------------------ - # To start better integration into IDE. - # ------------------------------------------------------------------------------ - - source_group( - "Qml" REGULAR_EXPRESSION ".+\.qml$" - ) - source_group( - "Js" REGULAR_EXPRESSION ".+\.js$" - ) - source_group( - "Svg" REGULAR_EXPRESSION ".+\.svg$" - ) - - # ------------------------------ - # Installation - # ------------------------------ - if(APPLE) - target_link_libraries(${TARGET_NAME} "${MINIZIP_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/libminizip.dylib") - execute_process(COMMAND install_name_tool -id "@executable_path/../Frameworks/libminizip.dylib" "${MINIZIP_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/libminizip.dylib") - elseif(NOT WIN32) - target_link_libraries(${TARGET_NAME} "${MINIZIP_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/libminizip.so") - endif() - endif()#If (LinphoneCxx_FOUND AND Minizip_FOUND) -endif()#If (LinphoneCxx_FOUND) +ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk" + SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-sdk" + INSTALL_DIR "${LINPHONE_OUTPUT_DIR}" + STAMP_DIR "${SDK_BUILD_DIR}/stamp" + BINARY_DIR "${SDK_BUILD_DIR}" + STEP_TARGETS build + BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} + INSTALL_COMMAND cmake -E echo "Skipping install step." + LIST_SEPARATOR | # Use the alternate list separator + CMAKE_ARGS ${ALL_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} ${USER_ARGS} + #BUILD_ALWAYS NO #${DO_BUILD} +) +ExternalProject_Add_Step(sdk force_build + COMMENT "Forcing build for 'desktop'" + DEPENDEES configure + DEPENDERS build + ALWAYS 1 +) +ExternalProject_Add(minizip PREFIX "${CMAKE_BINARY_DIR}/minizip" + SOURCE_DIR "${CMAKE_SOURCE_DIR}/submodules/externals/minizip" + INSTALL_DIR "${MINIZIP_OUTPUT_DIR}" + BUILD_ALWAYS ON + DEPENDS sdk + BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} + LIST_SEPARATOR | # Use the alternate list separator + CMAKE_ARGS ${ALL_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} ${USER_ARGS} +) +ExternalProject_Add(linphone-qt PREFIX "${CMAKE_BINARY_DIR}/linphoneqt" + SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-desktop" + INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" + DEPENDS minizip sdk + BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} + LIST_SEPARATOR | # Use the alternate list separator + CMAKE_ARGS ${ALL_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} ${USER_ARGS} + BUILD_ALWAYS ON +) +ExternalProject_Add(linphone-qt-only PREFIX "${CMAKE_BINARY_DIR}/linphoneqt" + SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-desktop" + INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" + BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} + LIST_SEPARATOR | # Use the alternate list separator + CMAKE_ARGS ${ALL_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} ${USER_ARGS} + EXCLUDE_FROM_ALL ON +) diff --git a/README.md b/README.md index 6a8d356e2..f6a27d55f 100644 --- a/README.md +++ b/README.md @@ -61,27 +61,23 @@ Note: If you have `qtchooser` set in your `PATH`, the best use is : ### Building -The build is done in 3 steps. First, you need to build the SDK, then the submodule Minizip and finally, the application. +The build is done by building the SDK, the submodule Minizip and the application. Their targets are `sdk`, `minizip` and `linphone-qt`. 1. Create your build folder at the root of the project : `mkdir build-desktop` Go to this new folder and begin the build process : `cd build-desktop` -2. Prepare your options : `cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo` By default, it will try compile all dependencies. You can remove some by adding `-DENABLE_=NO` to the command. You can use `cmake-gui ..` if you want to have a better access to them. +2. Prepare your options : `cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo`. By default, it will try compile all needed dependencies. You can remove some by adding `-DENABLE_=NO` to the command. You can use `cmake-gui ..` if you want to have a better access to them. -3. Build the SDK : `cmake --build . --target sdk --config RelWithDebInfo`. You can add `--parallel 10` if you have CMake>3.12 to speedup the process. +3. Build and install the whole project : `cmake --build . --target install --config RelWithDebInfo`. You can add `--parallel 10` to 10 parallel builds for speeding up the process if you have CMake>3.12. -4. Build The submodule. `cmake ..` and `cmake --build . --target install --config RelWithDebInfo` - -If the target install doesn't exist, it is because you had issues on the first step or the project generation could be done when calling `cmake ..`. - -5. Finish the process with a new `cmake ..` and `cmake --build . --target install --config RelWithDebInfo`. - -It is important to set the config in the process or you can have a bad configuration for your binary that could lead to some corruption : on Windows, this issue is spotted when trying to start the application and an empty file with a random name is created. So, you are working on an IDE (like Qt Creator), you may override the build command. +It is important to set the config in the process or you can have a bad configuration for your binary that could lead to some corruption : on Windows, this issue is spotted when trying to start the application and an empty file with a random name is created. So, if you are working on an IDE (like Qt Creator), you may override the build command. When all are over, the files will be in the OUTPUT folder in the build directory. -You can find a script file for each supported platform to achieve the first building. They only exist for convenience. -There are called `build_all_linux.sh`, `build_all_macos.sh` and `build_all_win.bat`. +4. When doing some modifications in the SDK, you can rebuild only the sdk with the target `sdk` + +5. For doing a package for specific platform, you can use `package` as target. This is only supported yet for Mac and Windows. + #### General Troubleshooting diff --git a/linphone-desktop/CMakeLists.txt b/linphone-desktop/CMakeLists.txt new file mode 100644 index 000000000..710283300 --- /dev/null +++ b/linphone-desktop/CMakeLists.txt @@ -0,0 +1,515 @@ +################################################################################ +# +# Copyright (c) 2017-2020 Belledonne Communications SARL. +# +# This file is part of linphone-desktop +# (see https://www.linphone.org). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +################################################################################ +cmake_minimum_required(VERSION 3.1) +project(linphoneqt VERSION 4.1.1) + +message("CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}") +message("Options : ${ENABLE_PACKAGING}, ${ENABLE_UPDATE_CHECK}, ${ENABLE_UNIT_TESTS}, ${ENABLE_TESTS}, ${ENABLE_TESTS_COMPONENTS}, ${ENABLE_TOOLS}, ${ENABLE_STRICT}, ${ENABLE_FFMPEG}, ${ENABLE_OPUS}") + +include(GNUInstallDirs) +include(CheckCXXCompilerFlag) + + +set(TARGET_NAME linphone-qt) +if( NOT("${CMAKE_GENERATOR}" MATCHES "Ninja")) +# set(TARGET_NAME_ONLY linphone-qt-only) +# set(APP_LIBRARY_ONLY app-library-only) +endif() +set(CMAKE_CXX_STANDARD 11) + +if(UNIX AND NOT APPLE) + set(CMAKE_INSTALL_RPATH "$ORIGIN;$ORIGIN/lib64;$ORIGIN/../lib64;$ORIGIN/lib;$ORIGIN/../lib") + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +endif() +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") + +set(APP_LIBRARY app-library) +include(application_info.cmake) +if(WIN32) + set(EXECUTABLE_OUTPUT_DIR "${CMAKE_BINARY_DIR}") + set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${EXECUTABLE_OUTPUT_DIR}") + set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${EXECUTABLE_OUTPUT_DIR}") + set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${EXECUTABLE_OUTPUT_DIR}") +endif() + +find_package(LinphoneCxx CONFIG) +find_package(Linphone CONFIG) +find_package(bctoolbox CONFIG) +find_package(belcard CONFIG) +find_package(Mediastreamer2 CONFIG) +find_package(ortp CONFIG) +#find_package(minizip) + +include(FindPkgConfig) +pkg_search_module(MINIZIP minizip) +set(MINIZIP_INCLUDE_DIRS "${MINIZIP_PREFIX}/${MINIZIP_INCLUDE_DIRS}") +#set(MINIZIP_LIBRARIES "${MINIZIP_PREFIX}/${MINIZIP_LIBRARIES}") + +message("MINIZIP : ${MINIZIP_INCLUDE_DIRS} => ${MINIZIP_LIBRARIES}") +message("INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} FRAMEWORK_PATH=${CMAKE_FRAMEWORK_PATH}") +message("LINPHONE : ${LINPHONE_INCLUDE_DIRS} => ${LINPHONE_LIBRARIES}") +message("LINPHONECXX : ${LINPHONECXX_INCLUDE_DIRS} => ${LINPHONECXX_LIBRARIES}") + +# Build configuration +set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG -DQT_NO_DEBUG") +set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DQT_QML_DEBUG -DQT_DECLARATIVE_DEBUG") +set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG -DQT_QML_DEBUG -DQT_DECLARATIVE_DEBUG") +if( WIN32) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WINSOCKAPI_")#remove error from windows headers order +endif() +set(CMAKE_INCLUDE_CURRENT_DIR ON)#useful for config.h + +set(QT5_PACKAGES Core Gui Quick Widgets QuickControls2 Svg LinguistTools Concurrent Network) +if (UNIX AND NOT APPLE) + list(APPEND QT5_PACKAGES DBus) +endif () +set(QT5_PACKAGES_OPTIONAL TextToSpeech) +set(CMAKE_AUTOMOC ON) +#------------------------------------------------- +set(ASSETS_DIR "assets") +set(SOURCES + src/app/App.cpp + src/app/AppController.cpp + src/app/cli/Cli.cpp + src/app/logger/Logger.cpp + src/app/paths/Paths.cpp + src/app/providers/AvatarProvider.cpp + src/app/providers/ImageProvider.cpp + src/app/providers/ThumbnailProvider.cpp + src/app/translator/DefaultTranslator.cpp + src/components/assistant/AssistantModel.cpp + src/components/authentication/AuthenticationNotifier.cpp + src/components/call/CallModel.cpp + src/components/calls/CallsListModel.cpp + src/components/calls/CallsListProxyModel.cpp + src/components/camera/Camera.cpp + src/components/camera/CameraPreview.cpp + src/components/camera/MSFunctions.cpp + src/components/chat/ChatModel.cpp + src/components/chat/ChatProxyModel.cpp + src/components/codecs/AbstractCodecsModel.cpp + src/components/codecs/AudioCodecsModel.cpp + src/components/codecs/VideoCodecsModel.cpp + src/components/conference/ConferenceAddModel.cpp + src/components/conference/ConferenceHelperModel.cpp + src/components/conference/ConferenceModel.cpp + src/components/contact/ContactModel.cpp + src/components/contact/VcardModel.cpp + src/components/contacts/ContactsListModel.cpp + src/components/contacts/ContactsListProxyModel.cpp + src/components/core/CoreHandlers.cpp + src/components/core/CoreManager.cpp + src/components/core/event-count-notifier/AbstractEventCountNotifier.cpp + src/components/file/FileDownloader.cpp + src/components/file/FileExtractor.cpp + src/components/notifier/Notifier.cpp + src/components/other/clipboard/Clipboard.cpp + src/components/other/colors/Colors.cpp + src/components/other/text-to-speech/TextToSpeech.cpp + src/components/other/units/Units.cpp + src/components/presence/OwnPresenceModel.cpp + src/components/presence/Presence.cpp + src/components/settings/AccountSettingsModel.cpp + src/components/settings/SettingsModel.cpp + src/components/sip-addresses/SipAddressesModel.cpp + src/components/sip-addresses/SipAddressesProxyModel.cpp + src/components/sip-addresses/SipAddressObserver.cpp + src/components/sound-player/SoundPlayer.cpp + src/components/telephone-numbers/TelephoneNumbersModel.cpp + src/components/timeline/TimelineModel.cpp + src/components/url-handlers/UrlHandlers.cpp + src/utils/LinphoneUtils.cpp + src/utils/MediastreamerUtils.cpp + src/utils/QExifImageHeader.cpp + src/utils/Utils.cpp + ) + +set(HEADERS + src/app/App.hpp + src/app/AppController.hpp + src/app/cli/Cli.hpp + src/app/logger/Logger.hpp + src/app/paths/Paths.hpp + src/app/providers/AvatarProvider.hpp + src/app/providers/ImageProvider.hpp + src/app/providers/ThumbnailProvider.hpp + src/app/single-application/SingleApplication.hpp + src/app/translator/DefaultTranslator.hpp + src/components/assistant/AssistantModel.hpp + src/components/authentication/AuthenticationNotifier.hpp + src/components/call/CallModel.hpp + src/components/calls/CallsListModel.hpp + src/components/calls/CallsListProxyModel.hpp + src/components/camera/Camera.hpp + src/components/camera/CameraPreview.hpp + src/components/camera/MSFunctions.hpp + src/components/chat/ChatModel.hpp + src/components/chat/ChatProxyModel.hpp + src/components/codecs/AbstractCodecsModel.hpp + src/components/codecs/AudioCodecsModel.hpp + src/components/codecs/VideoCodecsModel.hpp + src/components/Components.hpp + src/components/conference/ConferenceAddModel.hpp + src/components/conference/ConferenceHelperModel.hpp + src/components/conference/ConferenceModel.hpp + src/components/contact/ContactModel.hpp + src/components/contact/VcardModel.hpp + src/components/contacts/ContactsListModel.hpp + src/components/contacts/ContactsListProxyModel.hpp + src/components/core/CoreHandlers.hpp + src/components/core/CoreManager.hpp + src/components/core/event-count-notifier/AbstractEventCountNotifier.hpp + src/components/file/FileDownloader.hpp + src/components/file/FileExtractor.hpp + src/components/notifier/Notifier.hpp + src/components/other/clipboard/Clipboard.hpp + src/components/other/colors/Colors.hpp + src/components/other/desktop-tools/DesktopTools.hpp + src/components/other/text-to-speech/TextToSpeech.hpp + src/components/other/units/Units.hpp + src/components/presence/OwnPresenceModel.hpp + src/components/presence/Presence.hpp + src/components/settings/AccountSettingsModel.hpp + src/components/settings/SettingsModel.hpp + src/components/sip-addresses/SipAddressesModel.hpp + src/components/sip-addresses/SipAddressesProxyModel.hpp + src/components/sip-addresses/SipAddressObserver.hpp + src/components/sound-player/SoundPlayer.hpp + src/components/telephone-numbers/TelephoneNumbersModel.hpp + src/components/timeline/TimelineModel.hpp + src/components/url-handlers/UrlHandlers.hpp + src/utils/LinphoneUtils.hpp + src/utils/MediastreamerUtils.hpp + src/utils/QExifImageHeader.hpp + src/utils/Utils.hpp + ) + +set(MAIN_FILE src/app/main.cpp) + +if (APPLE) + list(APPEND SOURCES + src/app/single-application/SingleApplication.cpp + src/components/core/event-count-notifier/EventCountNotifierMacOs.m + src/components/other/desktop-tools/DesktopToolsMacOs.cpp + src/components/other/desktop-tools/screen-saver/ScreenSaverMacOs.m + src/components/other/desktop-tools/state-process/StateProcessMacOs.mm + ) + list(APPEND HEADERS + src/app/single-application/SingleApplicationPrivate.hpp + src/components/core/event-count-notifier/EventCountNotifierMacOs.hpp + src/components/other/desktop-tools/DesktopToolsMacOs.hpp + ) +elseif (WIN32) + list(APPEND SOURCES + src/app/single-application/SingleApplication.cpp + src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.cpp + src/components/other/desktop-tools/DesktopToolsWindows.cpp + ) + list(APPEND HEADERS + src/app/single-application/SingleApplicationPrivate.hpp + src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.hpp + src/components/other/desktop-tools/DesktopToolsWindows.hpp + ) +else () + list(APPEND SOURCES + src/app/single-application/SingleApplicationDBus.cpp + src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.cpp + src/components/other/desktop-tools/DesktopToolsLinux.cpp + src/components/other/desktop-tools/screen-saver/ScreenSaverDBus.cpp + src/components/other/desktop-tools/screen-saver/ScreenSaverXdg.cpp + ) + list(APPEND HEADERS + src/app/single-application/SingleApplicationDBusPrivate.hpp + src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.hpp + src/components/other/desktop-tools/DesktopToolsLinux.hpp + src/components/other/desktop-tools/screen-saver/ScreenSaverDBus.hpp + src/components/other/desktop-tools/screen-saver/ScreenSaverXdg.hpp + ) +endif () + +set(QRC_RESOURCES resources.qrc) + +set(LANGUAGES_DIRECTORY "${ASSETS_DIR}/languages") +set(I18N_FILENAME i18n.qrc) +set(LANGUAGES de en fr_FR ja lt ru sv tr pt_BR) + +# ------------------------------------------------------------------------------ + +function (PREPEND list prefix) + set(new_list "") + + foreach (elem ${${list}}) + list(APPEND new_list "${prefix}${elem}") + endforeach () + + set(${list} ${new_list} PARENT_SCOPE) +endfunction () + +# Force absolute paths. +PREPEND(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/") +PREPEND(HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/") + +# ------------------------------------------------------------------------------ +# Compute QML files list. +# ------------------------------------------------------------------------------ + +set(QML_SOURCES) +file(STRINGS ${QRC_RESOURCES} QRC_RESOURCES_CONTENT) +foreach (line ${QRC_RESOURCES_CONTENT}) + set(result) + string(REGEX REPLACE + "^[ \t]*<[ \t]*file[ \t]*>[ \t]*(.+\\.[a-z]+)[ \t]*<[ \t]*/[ \t]*file[ \t]*>[ \t]*$" + "\\1" + result + "${line}" + ) + string(REGEX MATCH "\\.[a-z]+$" is_ui ${result}) + if (NOT ${is_ui} STREQUAL "") + list(APPEND QML_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/${result}") + endif () +endforeach () + +# ------------------------------------------------------------------------------ +# Init git hooks. +# ------------------------------------------------------------------------------ + +if (NOT WIN32) + add_custom_target( + check_qml DEPENDS ${QML_SOURCES} + COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/tools/check_qml_syntax" + ) +endif() + +execute_process(COMMAND ${CMAKE_COMMAND} -E copy + "${CMAKE_CURRENT_SOURCE_DIR}/tools/private/pre-commit" + "${CMAKE_CURRENT_SOURCE_DIR}/../.git/hooks/pre-commit" + ) +set(_QML_IMPORT_PATHS "") +list(APPEND _QML_IMPORT_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/ui/modules") +list(APPEND _QML_IMPORT_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/ui/dev-modules") +list(APPEND _QML_IMPORT_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/ui/scripts") +list(APPEND _QML_IMPORT_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/ui/views") + + +set(QML_IMPORT_PATH ${_QML_IMPORT_PATHS} CACHE STRING "Path used to locate CMake modules by Qt Creator" FORCE) + + +if(APPLE) + if(MS2_PLUGINS_LOCATION) + set(MSPLUGINS_DIR ${MS2_PLUGINS_LOCATION}) + else() + set(MSPLUGINS_DIR "Frameworks/mediastreamer2.framework/Versions/A/Libraries") + endif() +else() + set(MSPLUGINS_DIR "${CMAKE_INSTALL_LIBDIR}/mediastreamer/plugins") +endif() +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.cmake" "${CMAKE_CURRENT_BINARY_DIR}/config.h") +# ------------------------------------------------------------------------------ +# Build. +# ------------------------------------------------------------------------------ + +include_directories(src/) + +find_package(Qt5 COMPONENTS ${QT5_PACKAGES} REQUIRED) +find_package(Qt5 COMPONENTS ${QT5_PACKAGES_OPTIONAL} QUIET) + +if (CMAKE_INSTALL_RPATH) + #Retrieve lib path from a know QT executable + get_target_property(LUPDATE_PATH Qt5::lupdate LOCATION) + get_filename_component(LUPDATE_PATH "${LUPDATE_PATH}" DIRECTORY) + get_filename_component(QT_PATH "${LUPDATE_PATH}/lib" ABSOLUTE) + list(APPEND CMAKE_INSTALL_RPATH "${QT_PATH}") +endif () +# Add languages support. +add_subdirectory("${LANGUAGES_DIRECTORY}" "assets/languages") +list(APPEND SOURCES "${CMAKE_CURRENT_BINARY_DIR}/${LANGUAGES_DIRECTORY}/${I18N_FILENAME}") + + +# Build and dependencies +link_directories("${MINIZIP_PREFIX}/${MINIZIP_LIBRARY_DIRS}") +#link_directories("${MINIZIP_PREFIX}/${MINIZIP_LIBRARY_DIRS}") + + + +#add_library(${APP_LIBRARY} OBJECT ${SOURCES} ${HEADERS} ${RESOURCES} ${QML_SOURCES}) +add_library(${APP_LIBRARY} OBJECT ${SOURCES} ${HEADERS} ${QML_SOURCES} ${QRC_RESOURCES}) +if(TARGET_NAME_ONLY) + add_library(${APP_LIBRARY_ONLY} OBJECT EXCLUDE_FROM_ALL ${SOURCES} ${HEADERS} ${QML_SOURCES} ${QRC_RESOURCES}) +endif() +if (WIN32) + add_executable(${TARGET_NAME} WIN32 $ ${ASSETS_DIR}/app-icon.rc ${MAIN_FILE}) + if(TARGET_NAME_ONLY) + add_executable(${TARGET_NAME_ONLY} WIN32 EXCLUDE_FROM_ALL $ ${ASSETS_DIR}/app-icon.rc ${MAIN_FILE}) + endif() +else () + add_executable(${TARGET_NAME} $ ${MAIN_FILE}) + if(TARGET_NAME_ONLY) + add_executable(${TARGET_NAME_ONLY} EXCLUDE_FROM_ALL $ ${MAIN_FILE}) + endif() +endif () +if(TARGET_NAME_ONLY) + target_compile_options(${TARGET_NAME_ONLY} PRIVATE -fPIC) + set_source_files_properties( ${APP_LIBRARY_ONLY} PROPERTIES EXTERNAL_OBJECT true GENERATED true ) + set_property(TARGET ${APP_LIBRARY_ONLY} PROPERTY POSITION_INDEPENDENT_CODE ON) #Need by Qt + set_property(TARGET ${APP_LIBRARY_ONLY} PROPERTY AUTORCC ON) + set_target_properties(${TARGET_NAME_ONLY} PROPERTIES OUTPUT_NAME "${EXECUTABLE_NAME}") +endif() +set_source_files_properties( ${APP_LIBRARY} PROPERTIES EXTERNAL_OBJECT true GENERATED true ) + +set_property(TARGET ${APP_LIBRARY} PROPERTY POSITION_INDEPENDENT_CODE ON) #Need by Qt + + +#Turn on automatic resources compilation by cmake +#Instead of excplicitely calling qt5_add_resources +set_property(TARGET ${APP_LIBRARY} PROPERTY AUTORCC ON) + +bc_git_version(${TARGET_NAME} ${PROJECT_VERSION}) + +set_target_properties(${TARGET_NAME} PROPERTIES OUTPUT_NAME "${EXECUTABLE_NAME}") + + +#ExternalProject_Get_Property(project_a install_dir) +#include_directories(${install_dir}/include) + +#add_dependencies(project_b_exe project_a) +#target_link_libraries(project_b_exe ${install_dir}/lib/alib.lib) + + +set(INCLUDED_DIRECTORIES "${LINPHONECXX_INCLUDE_DIRS}" "${MINIZIP_INCLUDE_DIRS}") +#set(LIBRARIES ${BCTOOLBOX_CORE_LIBRARIES} ${BELCARD_LIBRARIES} ${LINPHONE_LIBRARIES} ${LINPHONECXX_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES} ${ORTP_LIBRARIES} ${OPUS_LIBRARIES} ${MINIZIP_LIBRARIES}) +set(LIBRARIES ${BCTOOLBOX_CORE_LIBRARIES} ${BELCARD_LIBRARIES} ${LINPHONE_LIBRARIES} ${LINPHONECXX_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES} ${ORTP_LIBRARIES} ${OPUS_LIBRARIES} "minizip") +message("LIBRARIES : ${LIBRARIES}") + +foreach (package ${QT5_PACKAGES}) + list(APPEND INCLUDED_DIRECTORIES "${Qt5${package}_INCLUDE_DIRS}") + # `qt5_create_translation` is provided from `LinguistTools` package. + # But the `Qt5::LinguistTools` lib does not exist. Remove it. + if (NOT (${package} STREQUAL LinguistTools)) + list(APPEND LIBRARIES ${Qt5${package}_LIBRARIES}) + endif () +endforeach () + +foreach (package ${QT5_PACKAGES_OPTIONAL}) + if ("${Qt5${package}_FOUND}") + message("Optional package ${package} found.") + list(APPEND INCLUDED_DIRECTORIES "${Qt5${package}_INCLUDE_DIRS}") + list(APPEND LIBRARIES ${Qt5${package}_LIBRARIES}) + + string(TOUPPER "${package}" INCLUDE_NAME) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D${INCLUDE_NAME}_ENABLED") + else () + message("Optional package ${package} not found.") + endif () +endforeach () + +if (APPLE) + list(APPEND LIBRARIES "-framework Cocoa -framework IOKit") + # -framework linphone") #This doesn't work yet +endif () + +target_include_directories(${APP_LIBRARY} SYSTEM PRIVATE ${INCLUDED_DIRECTORIES}) + +target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${INCLUDED_DIRECTORIES}) + +if(TARGET_NAME_ONLY) + target_include_directories(${APP_LIBRARY_ONLY} SYSTEM PRIVATE ${INCLUDED_DIRECTORIES}) + target_include_directories(${TARGET_NAME_ONLY} SYSTEM PRIVATE ${INCLUDED_DIRECTORIES}) + target_link_libraries(${TARGET_NAME_ONLY} ${LIBRARIES}) + add_dependencies(${APP_LIBRARY_ONLY} update_translations ${TARGET_NAME}-git-version) + add_dependencies(${TARGET_NAME_ONLY} update_translations ) +endif() + +#target_link_libraries(${APP_LIBRARY} ${LIBRARIES}) +target_link_libraries(${TARGET_NAME} ${LIBRARIES}) + +if(WIN32) + target_link_libraries(${TARGET_NAME} wsock32 ws2_32) +endif() + +add_dependencies(${APP_LIBRARY} update_translations ${TARGET_NAME}-git-version) +add_dependencies(${TARGET_NAME} ${APP_LIBRARY}) + +if (UNIX AND NOT APPLE) + # Install desktop/icon files. + configure_file("${ASSETS_DIR}/linphone.desktop.cmake" "${EXECUTABLE_NAME}.desktop" @ONLY) + + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE_NAME}.desktop" + DESTINATION "${CMAKE_INSTALL_DATADIR}/applications" + ) + install(FILES "${ASSETS_DIR}/images/linphone_logo.svg" + DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps/" + RENAME "${EXECUTABLE_NAME}.svg" + ) + + set(ICON_DIRS 16x16 22x22 24x24 32x32 64x64 128x128 256x256) + foreach (DIR ${ICON_DIRS}) + install(FILES "${ASSETS_DIR}/icons/hicolor/${DIR}/apps/icon.png" + DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/${DIR}/apps/" + RENAME "${EXECUTABLE_NAME}.png" + ) + endforeach () +endif () + +# ------------------------------------------------------------------------------ +# CPack settings & RPM. +# ------------------------------------------------------------------------------ +set(LINPHONE_DESKTOP_DIR "${CMAKE_CURRENT_SOURCE_DIR}") +set(LINPHONE_SDK_DIR "${CMAKE_BINARY_DIR}/linphone-sdk") +set(TOOLS_DIR "${CMAKE_BINARY_DIR}/programs") +set(LINPHONE_SOURCE_DIR ${EP_linphone_SOURCE_DIR}) +set(LINPHONE_BUILDER_SIGNING_IDENTITY ${LINPHONE_BUILDER_SIGNING_IDENTITY}) +set(LINPHONE_SDK_TMP "${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE_NAME}-sdk-tmp") +message("LINPHONE_DESKTOP_DIR = ${LINPHONE_DESKTOP_DIR}") + +add_subdirectory(build) +add_subdirectory(cmake_builder/linphone_package) + +# ------------------------------------------------------------------------------ +# To start better integration into IDE. +# ------------------------------------------------------------------------------ + +source_group( + "Qml" REGULAR_EXPRESSION ".+\.qml$" + ) +source_group( + "Js" REGULAR_EXPRESSION ".+\.js$" + ) +source_group( + "Svg" REGULAR_EXPRESSION ".+\.svg$" + ) + + +# ------------------------------ +# Installation +# ------------------------------ +if(APPLE) + target_link_libraries(${TARGET_NAME} "${MINIZIP_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/libminizip.dylib") + execute_process(COMMAND install_name_tool -id "@executable_path/Frameworks/libminizip.dylib" "${MINIZIP_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/libminizip.dylib") +elseif(NOT WIN32) + # target_link_libraries(${TARGET_NAME} "${MINIZIP_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/libminizip.so") +endif() + +if(${CMAKE_GENERATOR} MATCHES "Ninja" OR ${CMAKE_VERSION} VERSION_LESS "3.15.0") +else() +# add_custom_command( TARGET ${TARGET_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} --install ${CMAKE_CURRENT_BINARY_DIR} --config ${CMAKE_BUILD_TYPE}) +# add_custom_command( TARGET ${TARGET_NAME_ONLY} POST_BUILD COMMAND ${CMAKE_COMMAND} --install ${CMAKE_CURRENT_BINARY_DIR} --config ${CMAKE_BUILD_TYPE}) +endif() diff --git a/linphone-desktop/cmake_builder/CMakeLists.txt b/linphone-desktop/cmake_builder/CMakeLists.txt index d05733df3..f4af5786c 100644 --- a/linphone-desktop/cmake_builder/CMakeLists.txt +++ b/linphone-desktop/cmake_builder/CMakeLists.txt @@ -19,10 +19,499 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################ +cmake_minimum_required(VERSION 3.1) +project(linphoneqt-sub VERSION 4.1.1) -lcb_define_targets("linphoneqt" "linphone" "ms2plugins") +message("CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}") -#if (NOT WIN32 AND NOT APPLE) -# lcb_blacklist_dependencies("turbojpeg") # turbo-jpeg is already provided by Qt5 so do not build it. -#endif () +message("Options : ${ENABLE_UPDATE_CHECK}, ${ENABLE_UNIT_TESTS}, ${ENABLE_TESTS}, ${ENABLE_TESTS_COMPONENTS}, ${ENABLE_TOOLS}, ${ENABLE_STRICT}, ${ENABLE_FFMPEG}, ${ENABLE_OPUS}") + +include(GNUInstallDirs) +include(CheckCXXCompilerFlag) + + +set(TARGET_NAME linphone-qt) +if( NOT("${CMAKE_GENERATOR}" MATCHES "Ninja")) +# set(TARGET_NAME_ONLY linphone-qt-only) +# set(APP_LIBRARY_ONLY app-library-only) +endif() +set(CMAKE_CXX_STANDARD 11) + +if(UNIX AND NOT APPLE) + set(CMAKE_INSTALL_RPATH "$ORIGIN;$ORIGIN/lib64;$ORIGIN/../lib64;$ORIGIN/lib;$ORIGIN/../lib") + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +endif() +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake") + +set(APP_LIBRARY app-library) +include(../application_info.cmake) +if(WIN32) + set(EXECUTABLE_OUTPUT_DIR "${CMAKE_BINARY_DIR}") + set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${EXECUTABLE_OUTPUT_DIR}") + set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${EXECUTABLE_OUTPUT_DIR}") + set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${EXECUTABLE_OUTPUT_DIR}") +endif() + +find_package(LinphoneCxx CONFIG) +find_package(Linphone CONFIG) +find_package(bctoolbox CONFIG) +find_package(belcard CONFIG) +find_package(Mediastreamer2 CONFIG) +find_package(ortp CONFIG) +#find_package(minizip) + +include(FindPkgConfig) +pkg_search_module(MINIZIP minizip) +set(MINIZIP_INCLUDE_DIRS "${MINIZIP_PREFIX}/${MINIZIP_INCLUDE_DIRS}") +#set(MINIZIP_LIBRARIES "${MINIZIP_PREFIX}/${MINIZIP_LIBRARIES}") + +message("MINIZIP : ${MINIZIP_INCLUDE_DIRS} => ${MINIZIP_LIBRARIES}") +message("INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} FRAMEWORK_PATH=${CMAKE_FRAMEWORK_PATH}") +message("LINPHONE : ${LINPHONE_INCLUDE_DIRS} => ${LINPHONE_LIBRARIES}") +message("LINPHONECXX : ${LINPHONECXX_INCLUDE_DIRS} => ${LINPHONECXX_LIBRARIES}") + +# Build configuration +set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG -DQT_NO_DEBUG") +set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DQT_QML_DEBUG -DQT_DECLARATIVE_DEBUG") +set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG -DQT_QML_DEBUG -DQT_DECLARATIVE_DEBUG") +if( WIN32) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WINSOCKAPI_")#remove error from windows headers order +endif() +set(CMAKE_INCLUDE_CURRENT_DIR ON)#useful for config.h + +set(QT5_PACKAGES Core Gui Quick Widgets QuickControls2 Svg LinguistTools Concurrent Network) +if (UNIX AND NOT APPLE) + list(APPEND QT5_PACKAGES DBus) +endif () +set(QT5_PACKAGES_OPTIONAL TextToSpeech) +set(CMAKE_AUTOMOC ON) +#------------------------------------------------- +set(ASSETS_DIR "assets") +set(SOURCES + src/app/App.cpp + src/app/AppController.cpp + src/app/cli/Cli.cpp + src/app/logger/Logger.cpp + src/app/paths/Paths.cpp + src/app/providers/AvatarProvider.cpp + src/app/providers/ImageProvider.cpp + src/app/providers/ThumbnailProvider.cpp + src/app/translator/DefaultTranslator.cpp + src/components/assistant/AssistantModel.cpp + src/components/authentication/AuthenticationNotifier.cpp + src/components/call/CallModel.cpp + src/components/calls/CallsListModel.cpp + src/components/calls/CallsListProxyModel.cpp + src/components/camera/Camera.cpp + src/components/camera/CameraPreview.cpp + src/components/camera/MSFunctions.cpp + src/components/chat/ChatModel.cpp + src/components/chat/ChatProxyModel.cpp + src/components/codecs/AbstractCodecsModel.cpp + src/components/codecs/AudioCodecsModel.cpp + src/components/codecs/VideoCodecsModel.cpp + src/components/conference/ConferenceAddModel.cpp + src/components/conference/ConferenceHelperModel.cpp + src/components/conference/ConferenceModel.cpp + src/components/contact/ContactModel.cpp + src/components/contact/VcardModel.cpp + src/components/contacts/ContactsListModel.cpp + src/components/contacts/ContactsListProxyModel.cpp + src/components/core/CoreHandlers.cpp + src/components/core/CoreManager.cpp + src/components/core/event-count-notifier/AbstractEventCountNotifier.cpp + src/components/file/FileDownloader.cpp + src/components/file/FileExtractor.cpp + src/components/notifier/Notifier.cpp + src/components/other/clipboard/Clipboard.cpp + src/components/other/colors/Colors.cpp + src/components/other/text-to-speech/TextToSpeech.cpp + src/components/other/units/Units.cpp + src/components/presence/OwnPresenceModel.cpp + src/components/presence/Presence.cpp + src/components/settings/AccountSettingsModel.cpp + src/components/settings/SettingsModel.cpp + src/components/sip-addresses/SipAddressesModel.cpp + src/components/sip-addresses/SipAddressesProxyModel.cpp + src/components/sip-addresses/SipAddressObserver.cpp + src/components/sound-player/SoundPlayer.cpp + src/components/telephone-numbers/TelephoneNumbersModel.cpp + src/components/timeline/TimelineModel.cpp + src/components/url-handlers/UrlHandlers.cpp + src/utils/LinphoneUtils.cpp + src/utils/MediastreamerUtils.cpp + src/utils/QExifImageHeader.cpp + src/utils/Utils.cpp + ) + +set(HEADERS + src/app/App.hpp + src/app/AppController.hpp + src/app/cli/Cli.hpp + src/app/logger/Logger.hpp + src/app/paths/Paths.hpp + src/app/providers/AvatarProvider.hpp + src/app/providers/ImageProvider.hpp + src/app/providers/ThumbnailProvider.hpp + src/app/single-application/SingleApplication.hpp + src/app/translator/DefaultTranslator.hpp + src/components/assistant/AssistantModel.hpp + src/components/authentication/AuthenticationNotifier.hpp + src/components/call/CallModel.hpp + src/components/calls/CallsListModel.hpp + src/components/calls/CallsListProxyModel.hpp + src/components/camera/Camera.hpp + src/components/camera/CameraPreview.hpp + src/components/camera/MSFunctions.hpp + src/components/chat/ChatModel.hpp + src/components/chat/ChatProxyModel.hpp + src/components/codecs/AbstractCodecsModel.hpp + src/components/codecs/AudioCodecsModel.hpp + src/components/codecs/VideoCodecsModel.hpp + src/components/Components.hpp + src/components/conference/ConferenceAddModel.hpp + src/components/conference/ConferenceHelperModel.hpp + src/components/conference/ConferenceModel.hpp + src/components/contact/ContactModel.hpp + src/components/contact/VcardModel.hpp + src/components/contacts/ContactsListModel.hpp + src/components/contacts/ContactsListProxyModel.hpp + src/components/core/CoreHandlers.hpp + src/components/core/CoreManager.hpp + src/components/core/event-count-notifier/AbstractEventCountNotifier.hpp + src/components/file/FileDownloader.hpp + src/components/file/FileExtractor.hpp + src/components/notifier/Notifier.hpp + src/components/other/clipboard/Clipboard.hpp + src/components/other/colors/Colors.hpp + src/components/other/desktop-tools/DesktopTools.hpp + src/components/other/text-to-speech/TextToSpeech.hpp + src/components/other/units/Units.hpp + src/components/presence/OwnPresenceModel.hpp + src/components/presence/Presence.hpp + src/components/settings/AccountSettingsModel.hpp + src/components/settings/SettingsModel.hpp + src/components/sip-addresses/SipAddressesModel.hpp + src/components/sip-addresses/SipAddressesProxyModel.hpp + src/components/sip-addresses/SipAddressObserver.hpp + src/components/sound-player/SoundPlayer.hpp + src/components/telephone-numbers/TelephoneNumbersModel.hpp + src/components/timeline/TimelineModel.hpp + src/components/url-handlers/UrlHandlers.hpp + src/utils/LinphoneUtils.hpp + src/utils/MediastreamerUtils.hpp + src/utils/QExifImageHeader.hpp + src/utils/Utils.hpp + ) + +set(MAIN_FILE ../src/app/main.cpp) + +if (APPLE) + list(APPEND SOURCES + src/app/single-application/SingleApplication.cpp + src/components/core/event-count-notifier/EventCountNotifierMacOs.m + src/components/other/desktop-tools/DesktopToolsMacOs.cpp + src/components/other/desktop-tools/screen-saver/ScreenSaverMacOs.m + src/components/other/desktop-tools/state-process/StateProcessMacOs.mm + ) + list(APPEND HEADERS + src/app/single-application/SingleApplicationPrivate.hpp + src/components/core/event-count-notifier/EventCountNotifierMacOs.hpp + src/components/other/desktop-tools/DesktopToolsMacOs.hpp + ) +elseif (WIN32) + list(APPEND SOURCES + src/app/single-application/SingleApplication.cpp + src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.cpp + src/components/other/desktop-tools/DesktopToolsWindows.cpp + ) + list(APPEND HEADERS + src/app/single-application/SingleApplicationPrivate.hpp + src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.hpp + src/components/other/desktop-tools/DesktopToolsWindows.hpp + ) +else () + list(APPEND SOURCES + src/app/single-application/SingleApplicationDBus.cpp + src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.cpp + src/components/other/desktop-tools/DesktopToolsLinux.cpp + src/components/other/desktop-tools/screen-saver/ScreenSaverDBus.cpp + src/components/other/desktop-tools/screen-saver/ScreenSaverXdg.cpp + ) + list(APPEND HEADERS + src/app/single-application/SingleApplicationDBusPrivate.hpp + src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.hpp + src/components/other/desktop-tools/DesktopToolsLinux.hpp + src/components/other/desktop-tools/screen-saver/ScreenSaverDBus.hpp + src/components/other/desktop-tools/screen-saver/ScreenSaverXdg.hpp + ) +endif () + +set(QRC_RESOURCES ../resources.qrc) + +set(LANGUAGES_DIRECTORY "${ASSETS_DIR}/languages") +set(I18N_FILENAME i18n.qrc) +set(LANGUAGES de en fr_FR ja lt ru sv tr pt_BR) + +# ------------------------------------------------------------------------------ + +function (PREPEND list prefix) + set(new_list "") + + foreach (elem ${${list}}) + list(APPEND new_list "${prefix}${elem}") + endforeach () + + set(${list} ${new_list} PARENT_SCOPE) +endfunction () + +# Force absolute paths. +PREPEND(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/../") +PREPEND(HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/../") + +# ------------------------------------------------------------------------------ +# Compute QML files list. +# ------------------------------------------------------------------------------ + +set(QML_SOURCES) +file(STRINGS ${QRC_RESOURCES} QRC_RESOURCES_CONTENT) +foreach (line ${QRC_RESOURCES_CONTENT}) + set(result) + string(REGEX REPLACE + "^[ \t]*<[ \t]*file[ \t]*>[ \t]*(.+\\.[a-z]+)[ \t]*<[ \t]*/[ \t]*file[ \t]*>[ \t]*$" + "\\1" + result + "${line}" + ) + string(REGEX MATCH "\\.[a-z]+$" is_ui ${result}) + if (NOT ${is_ui} STREQUAL "") + list(APPEND QML_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/../${result}") + endif () +endforeach () + +# ------------------------------------------------------------------------------ +# Init git hooks. +# ------------------------------------------------------------------------------ + +if (NOT WIN32) + add_custom_target( + check_qml DEPENDS ${QML_SOURCES} + COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/../tools/check_qml_syntax" + ) +endif() + +execute_process(COMMAND ${CMAKE_COMMAND} -E copy + "${CMAKE_CURRENT_SOURCE_DIR}/../tools/private/pre-commit" + "${CMAKE_CURRENT_SOURCE_DIR}/../.git/hooks/pre-commit" + ) +set(_QML_IMPORT_PATHS "") +list(APPEND _QML_IMPORT_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/../ui/modules") +list(APPEND _QML_IMPORT_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/../ui/dev-modules") +list(APPEND _QML_IMPORT_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/../ui/scripts") +list(APPEND _QML_IMPORT_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/../ui/views") + + +set(QML_IMPORT_PATH ${_QML_IMPORT_PATHS} CACHE STRING "Path used to locate CMake modules by Qt Creator" FORCE) + + +if(APPLE) + if(MS2_PLUGINS_LOCATION) + set(MSPLUGINS_DIR ${MS2_PLUGINS_LOCATION}) + else() + set(MSPLUGINS_DIR "Frameworks/mediastreamer2.framework/Versions/A/Libraries") + endif() +else() + set(MSPLUGINS_DIR "${CMAKE_INSTALL_LIBDIR}/mediastreamer/plugins") +endif() +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../src/config.h.cmake" "${CMAKE_CURRENT_BINARY_DIR}/config.h") +# ------------------------------------------------------------------------------ +# Build. +# ------------------------------------------------------------------------------ + +include_directories(../src/) + +find_package(Qt5 COMPONENTS ${QT5_PACKAGES} REQUIRED) +find_package(Qt5 COMPONENTS ${QT5_PACKAGES_OPTIONAL} QUIET) + +if (CMAKE_INSTALL_RPATH) + #Retrieve lib path from a know QT executable + get_target_property(LUPDATE_PATH Qt5::lupdate LOCATION) + get_filename_component(LUPDATE_PATH "${LUPDATE_PATH}" DIRECTORY) + get_filename_component(QT_PATH "${LUPDATE_PATH}/../lib" ABSOLUTE) + list(APPEND CMAKE_INSTALL_RPATH "${QT_PATH}") +endif () +# Add languages support. +add_subdirectory("../${LANGUAGES_DIRECTORY}" "assets/languages") +list(APPEND SOURCES "${CMAKE_CURRENT_BINARY_DIR}/${LANGUAGES_DIRECTORY}/${I18N_FILENAME}") + + +# Build and dependencies +link_directories("${MINIZIP_PREFIX}/${MINIZIP_LIBRARY_DIRS}") +#link_directories("${MINIZIP_PREFIX}/${MINIZIP_LIBRARY_DIRS}") + + + +#add_library(${APP_LIBRARY} OBJECT ${SOURCES} ${HEADERS} ${RESOURCES} ${QML_SOURCES}) +add_library(${APP_LIBRARY} OBJECT ${SOURCES} ${HEADERS} ${QML_SOURCES} ${QRC_RESOURCES}) +if(TARGET_NAME_ONLY) + add_library(${APP_LIBRARY_ONLY} OBJECT EXCLUDE_FROM_ALL ${SOURCES} ${HEADERS} ${QML_SOURCES} ${QRC_RESOURCES}) +endif() +if (WIN32) + add_executable(${TARGET_NAME} WIN32 $ ${ASSETS_DIR}/app-icon.rc ${MAIN_FILE}) + if(TARGET_NAME_ONLY) + add_executable(${TARGET_NAME_ONLY} WIN32 EXCLUDE_FROM_ALL $ ${ASSETS_DIR}/app-icon.rc ${MAIN_FILE}) + endif() +else () + add_executable(${TARGET_NAME} $ ${MAIN_FILE}) + if(TARGET_NAME_ONLY) + add_executable(${TARGET_NAME_ONLY} EXCLUDE_FROM_ALL $ ${MAIN_FILE}) + endif() +endif () +if(TARGET_NAME_ONLY) + target_compile_options(${TARGET_NAME_ONLY} PRIVATE -fPIC) + set_source_files_properties( ${APP_LIBRARY_ONLY} PROPERTIES EXTERNAL_OBJECT true GENERATED true ) + set_property(TARGET ${APP_LIBRARY_ONLY} PROPERTY POSITION_INDEPENDENT_CODE ON) #Need by Qt + set_property(TARGET ${APP_LIBRARY_ONLY} PROPERTY AUTORCC ON) + set_target_properties(${TARGET_NAME_ONLY} PROPERTIES OUTPUT_NAME "${EXECUTABLE_NAME}") +endif() +set_source_files_properties( ${APP_LIBRARY} PROPERTIES EXTERNAL_OBJECT true GENERATED true ) + +set_property(TARGET ${APP_LIBRARY} PROPERTY POSITION_INDEPENDENT_CODE ON) #Need by Qt + + +#Turn on automatic resources compilation by cmake +#Instead of excplicitely calling qt5_add_resources +set_property(TARGET ${APP_LIBRARY} PROPERTY AUTORCC ON) + +bc_git_version(${TARGET_NAME} ${PROJECT_VERSION}) + +set_target_properties(${TARGET_NAME} PROPERTIES OUTPUT_NAME "${EXECUTABLE_NAME}") + + +#ExternalProject_Get_Property(project_a install_dir) +#include_directories(${install_dir}/include) + +#add_dependencies(project_b_exe project_a) +#target_link_libraries(project_b_exe ${install_dir}/lib/alib.lib) + + +set(INCLUDED_DIRECTORIES "${LINPHONECXX_INCLUDE_DIRS}" "${MINIZIP_INCLUDE_DIRS}") +#set(LIBRARIES ${BCTOOLBOX_CORE_LIBRARIES} ${BELCARD_LIBRARIES} ${LINPHONE_LIBRARIES} ${LINPHONECXX_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES} ${ORTP_LIBRARIES} ${OPUS_LIBRARIES} ${MINIZIP_LIBRARIES}) +set(LIBRARIES ${BCTOOLBOX_CORE_LIBRARIES} ${BELCARD_LIBRARIES} ${LINPHONE_LIBRARIES} ${LINPHONECXX_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES} ${ORTP_LIBRARIES} ${OPUS_LIBRARIES} "minizip") +message("LIBRARIES : ${LIBRARIES}") + +foreach (package ${QT5_PACKAGES}) + list(APPEND INCLUDED_DIRECTORIES "${Qt5${package}_INCLUDE_DIRS}") + # `qt5_create_translation` is provided from `LinguistTools` package. + # But the `Qt5::LinguistTools` lib does not exist. Remove it. + if (NOT (${package} STREQUAL LinguistTools)) + list(APPEND LIBRARIES ${Qt5${package}_LIBRARIES}) + endif () +endforeach () + +foreach (package ${QT5_PACKAGES_OPTIONAL}) + if ("${Qt5${package}_FOUND}") + message("Optional package ${package} found.") + list(APPEND INCLUDED_DIRECTORIES "${Qt5${package}_INCLUDE_DIRS}") + list(APPEND LIBRARIES ${Qt5${package}_LIBRARIES}) + + string(TOUPPER "${package}" INCLUDE_NAME) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D${INCLUDE_NAME}_ENABLED") + else () + message("Optional package ${package} not found.") + endif () +endforeach () + +if (APPLE) + list(APPEND LIBRARIES "-framework Cocoa -framework IOKit") + # -framework linphone") #This doesn't work yet +endif () + +target_include_directories(${APP_LIBRARY} SYSTEM PRIVATE ${INCLUDED_DIRECTORIES}) + +target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${INCLUDED_DIRECTORIES}) + +if(TARGET_NAME_ONLY) + target_include_directories(${APP_LIBRARY_ONLY} SYSTEM PRIVATE ${INCLUDED_DIRECTORIES}) + target_include_directories(${TARGET_NAME_ONLY} SYSTEM PRIVATE ${INCLUDED_DIRECTORIES}) + target_link_libraries(${TARGET_NAME_ONLY} ${LIBRARIES}) + add_dependencies(${APP_LIBRARY_ONLY} update_translations ${TARGET_NAME}-git-version) + add_dependencies(${TARGET_NAME_ONLY} update_translations ) +endif() + +#target_link_libraries(${APP_LIBRARY} ${LIBRARIES}) +target_link_libraries(${TARGET_NAME} ${LIBRARIES}) + +if(WIN32) + target_link_libraries(${TARGET_NAME} wsock32 ws2_32) +endif() + +add_dependencies(${APP_LIBRARY} update_translations ${TARGET_NAME}-git-version) +add_dependencies(${TARGET_NAME} ${APP_LIBRARY}) + +if (UNIX AND NOT APPLE) + # Install desktop/icon files. + configure_file("../${ASSETS_DIR}/linphone.desktop.cmake" "${EXECUTABLE_NAME}.desktop" @ONLY) + + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE_NAME}.desktop" + DESTINATION "${CMAKE_INSTALL_DATADIR}/applications" + ) + install(FILES "../${ASSETS_DIR}/images/linphone_logo.svg" + DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps/" + RENAME "${EXECUTABLE_NAME}.svg" + ) + + set(ICON_DIRS 16x16 22x22 24x24 32x32 64x64 128x128 256x256) + foreach (DIR ${ICON_DIRS}) + install(FILES "../${ASSETS_DIR}/icons/hicolor/${DIR}/apps/icon.png" + DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/${DIR}/apps/" + RENAME "${EXECUTABLE_NAME}.png" + ) + endforeach () +endif () + +# ------------------------------------------------------------------------------ +# CPack settings & RPM. +# ------------------------------------------------------------------------------ +set(LINPHONE_DESKTOP_DIR "${CMAKE_CURRENT_SOURCE_DIR}/..") +set(LINPHONE_SDK_DIR "${CMAKE_BINARY_DIR}/linphone-sdk") +set(TOOLS_DIR "${CMAKE_BINARY_DIR}/programs") +set(LINPHONE_SOURCE_DIR ${EP_linphone_SOURCE_DIR}) +set(LINPHONE_BUILDER_SIGNING_IDENTITY ${LINPHONE_BUILDER_SIGNING_IDENTITY}) +set(LINPHONE_SDK_TMP "${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE_NAME}-sdk-tmp") +message("LINPHONE_DESKTOP_DIR = ${LINPHONE_DESKTOP_DIR}") + +add_subdirectory(../build build) +add_subdirectory(linphone_package) + +# ------------------------------------------------------------------------------ +# To start better integration into IDE. +# ------------------------------------------------------------------------------ + +source_group( + "Qml" REGULAR_EXPRESSION ".+\.qml$" + ) +source_group( + "Js" REGULAR_EXPRESSION ".+\.js$" + ) +source_group( + "Svg" REGULAR_EXPRESSION ".+\.svg$" + ) + + +# ------------------------------ +# Installation +# ------------------------------ +if(APPLE) + target_link_libraries(${TARGET_NAME} "${MINIZIP_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/libminizip.dylib") + execute_process(COMMAND install_name_tool -id "@executable_path/../Frameworks/libminizip.dylib" "${MINIZIP_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/libminizip.dylib") +elseif(NOT WIN32) + # target_link_libraries(${TARGET_NAME} "${MINIZIP_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/libminizip.so") +endif() + +if(${CMAKE_GENERATOR} MATCHES "Ninja" OR ${CMAKE_VERSION} VERSION_LESS "3.15.0") +else() +# add_custom_command( TARGET ${TARGET_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} --install ${CMAKE_CURRENT_BINARY_DIR} --config ${CMAKE_BUILD_TYPE}) +# add_custom_command( TARGET ${TARGET_NAME_ONLY} POST_BUILD COMMAND ${CMAKE_COMMAND} --install ${CMAKE_CURRENT_BINARY_DIR} --config ${CMAKE_BUILD_TYPE}) +endif() diff --git a/linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt b/linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt index b40683633..8bb6f2e4e 100644 --- a/linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt +++ b/linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt @@ -1,31 +1,30 @@ -############################################################################ -# CMakeLists.txt -# Copyright (C) 2017-2018 Belledonne Communications, Grenoble France +################################################################################ # -############################################################################ +# Copyright (c) 2017-2020 Belledonne Communications SARL. +# +# This file is part of linphone-desktop +# (see https://www.linphone.org). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . # -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -############################################################################ +################################################################################ cmake_minimum_required(VERSION 3.1) project(LINPHONE_PACKAGE) # Dummy project. include("${LINPHONE_DESKTOP_DIR}/application_info.cmake") -find_package(Linphone REQUIRED) find_package(Git) #Policy set to allow link from other directory (cmake 3.13) if (POLICY CMP0079) @@ -203,23 +202,25 @@ else()# Not Windows and Apple execute_process(COMMAND install_name_tool -rpath "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}" "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" "${LIBRARY}") endforeach () message(${CMAKE_INSTALL_PREFIX}) - install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_BINDIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}" USE_SOURCE_PERMISSIONS) + install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_BINDIR}/" DESTINATION "${CMAKE_INSTALL_BINDIR}" USE_SOURCE_PERMISSIONS) #Just in case. This is useless because we have to use CMAKE_INSTALL_LIBDIR if( EXISTS "${LINPHONE_OUTPUT_DIR}/lib/") - install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/lib/" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" USE_SOURCE_PERMISSIONS) + install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/lib/" DESTINATION "lib" USE_SOURCE_PERMISSIONS) endif() if( EXISTS "${LINPHONE_OUTPUT_DIR}/lib64/") - install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/lib64/" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib64" USE_SOURCE_PERMISSIONS) + install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/lib64/" DESTINATION "lib64" USE_SOURCE_PERMISSIONS) endif() - install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}" USE_SOURCE_PERMISSIONS) + install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}" USE_SOURCE_PERMISSIONS) + + message("INSTALLATION : ${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/" ) if (EXISTS "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/mediastreamer") - file(COPY "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/mediastreamer" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" USE_SOURCE_PERMISSIONS) + file(COPY "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/mediastreamer" DESTINATION "${CMAKE_INSTALL_LIBDIR}" USE_SOURCE_PERMISSIONS) endif () - install(FILES "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/belr/grammars/cpim_grammar" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/belr/grammars/") - install(FILES "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/belr/grammars/vcard_grammar" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/belr/grammars/") - install(FILES "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/linphone/rootca.pem" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/${APPLICATION_NAME}") #We use executable_name because of name folder that is not harmonized from the SDK - install(PROGRAMS "${CMAKE_BINARY_DIR}/${EXECUTABLE_NAME}" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") + install(FILES "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/belr/grammars/cpim_grammar" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/belr/grammars/") + install(FILES "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/belr/grammars/vcard_grammar" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/belr/grammars/") + install(FILES "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/linphone/rootca.pem" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${APPLICATION_NAME}") #We use executable_name because of name folder that is not harmonized from the SDK + install(PROGRAMS "${CMAKE_BINARY_DIR}/${EXECUTABLE_NAME}" DESTINATION "${CMAKE_INSTALL_BINDIR}") endif () if (MSVC) @@ -257,91 +258,92 @@ endif () # ============================================================================== # CPack. # ============================================================================== - -set(CPACK_BINARY_STGZ OFF) -set(CPACK_BINARY_TGZ OFF) -set(CPACK_PACKAGE_NAME "${APPLICATION_NAME}") -set(CPACK_PACKAGE_VENDOR "${APPLICATION_VENDOR}") -set(CPACK_PACKAGE_VERSION_MAJOR ${LINPHONE_MAJOR_VERSION}) -set(CPACK_PACKAGE_VERSION_MINOR ${LINPHONE_MINOR_VERSION}) -if (LINPHONE_MICRO_VERSION) - set(CPACK_PACKAGE_VERSION_PATCH ${LINPHONE_MICRO_VERSION}) -endif () -set(CPACK_PACKAGE_EXECUTABLES "${EXECUTABLE_NAME};${APPLICATION_NAME}") -set(CPACK_RESOURCE_FILE_LICENSE "${LINPHONE_DESKTOP_DIR}/LICENSE.txt") -set(CPACK_PACKAGE_INSTALL_DIRECTORY "${APPLICATION_NAME}") -set(CPACK_PACKAGE_DIRECTORY "${CMAKE_BINARY_DIR}/CPackBuild") -set(CPACK_PACKAGE_ICON "${LINPHONE_DESKTOP_DIR}/assets/icon.ico") - - -if (APPLE) - set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${LINPHONE_GIT_REVISION}-mac") - set(CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/macos/background_dmg.jpg") - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/macos/linphone_dmg.scpt.in" "linphone_dmg.scpt" @ONLY) - set(CPACK_DMG_DS_STORE_SETUP_SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/linphone_dmg.scpt") - set(CPACK_BINARY_DRAGNDROP ON) -else() -endif () - -if (WIN32) - set(CPACK_GENERATOR "NSIS") - set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${LINPHONE_GIT_REVISION}-win32") - string(COMPARE EQUAL ${CPACK_GENERATOR} "NSIS" IS_NSIS) - if (${IS_NSIS}) - set(PACKAGE_EXT "exe") - # Use magic `NSIS.template.in` template from the current source directory to force uninstallation - # and ensure that linphone is not running before installation. - set(CPACK_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/windows") - set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\windows\\\\nsis_banner.bmp") - set(CPACK_NSIS_MUI_ICON "${LINPHONE_DESKTOP_DIR}/assets/icon.ico") - set(CPACK_NSIS_MUI_UNIICON "${LINPHONE_DESKTOP_DIR}/assets/icon.ico") - set(CPACK_NSIS_DISPLAY_NAME "${APPLICATION_NAME}") - if (LINPHONE_MICRO_VERSION) - set(CPACK_NSIS_PACKAGE_NAME "${APPLICATION_NAME} ${LINPHONE_MAJOR_VERSION}.${LINPHONE_MINOR_VERSION}.${LINPHONE_MICRO_VERSION}") - else () - set(CPACK_NSIS_PACKAGE_NAME "${APPLICATION_NAME} ${LINPHONE_MAJOR_VERSION}.${LINPHONE_MINOR_VERSION}") - endif () - set(CPACK_NSIS_URL_INFO_ABOUT ${APPLICATION_URL}) - - file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}" DOS_STYLE_BINARY_DIR) - string(REPLACE "\\" "\\\\" ESCAPED_DOS_STYLE_BINARY_DIR "${DOS_STYLE_BINARY_DIR}") - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/windows/install.nsi.in" "${CMAKE_CURRENT_BINARY_DIR}/install.nsi" @ONLY) - set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "!include \\\"${ESCAPED_DOS_STYLE_BINARY_DIR}\\\\install.nsi\\\"") - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/windows/uninstall.nsi.in" "${CMAKE_CURRENT_BINARY_DIR}/uninstall.nsi" COPYONLY) - set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "!include \\\"${ESCAPED_DOS_STYLE_BINARY_DIR}\\\\uninstall.nsi\\\"") - else () - set(PACKAGE_EXT "msi") - - set(CPACK_WIX_UPGRADE_GUID "C748668E-53D0-4088-A548-E33A76615A3B") - set(CPACK_WIX_PRODUCT_ICON "${LINPHONE_DESKTOP_DIR}/assets/icon.ico") - set(CPACK_WIX_PROPERTY_ARPURLINFOABOUT "${APPLICATION_URL}") - - # TODO: Deal with install/uninstall.nsi - endif () - - # Sign the installer. - set(TIMESTAMP_URL "http://timestamp.verisign.com/scripts/timestamp.dll") - set(PFX_FILE "${CMAKE_CURRENT_SOURCE_DIR}/sign/linphone.pfx") - set(PASSPHRASE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/sign/passphrase.txt") - get_filename_component(WINSDK_DIR "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows;CurrentInstallFolder]" REALPATH CACHE) - find_package(PythonInterp) - find_program(SIGNTOOL signtool PATHS ${WINSDK_DIR}/${CMAKE_INSTALL_BINDIR}) - set(SIGNTOOL_COMMAND "${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/windows/signtool.py") - set(PERFORM_SIGNING 0) - if (EXISTS ${PFX_FILE}) - if (SIGNTOOL) - set(SIGNTOOL_COMMAND "${SIGNTOOL_COMMAND} signtool sign /f ${PFX_FILE}") - set(SIGNTOOL_COMMAND "${SIGNTOOL_COMMAND} /p ${PASSPHRASE_FILE}") - set(SIGNTOOL_COMMAND "${SIGNTOOL_COMMAND} /t ${TIMESTAMP_URL}") - message("Found signtool and certificate ${PFX_FILE}") - set(PERFORM_SIGNING 1) - else () - message(STATUS "Could not find signtool! Code signing disabled (${SIGNTOOL})") - endif () - else () - message(STATUS "No signtool certificate found; assuming development machine (${PFX_FILE})") - endif () - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/windows/packaging.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/packaging.cmake" @ONLY) - # install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/packaging.cmake") -endif () -include(CPack) +if(${ENABLE_PACKAGING}) + set(CPACK_BINARY_STGZ OFF) + set(CPACK_BINARY_TGZ OFF) + set(CPACK_BINARY_TZ OFF) + set(CPACK_PACKAGE_NAME "${APPLICATION_NAME}") + set(CPACK_PACKAGE_VENDOR "${APPLICATION_VENDOR}") + set(CPACK_PACKAGE_VERSION_MAJOR ${LINPHONE_MAJOR_VERSION}) + set(CPACK_PACKAGE_VERSION_MINOR ${LINPHONE_MINOR_VERSION}) + if (LINPHONE_MICRO_VERSION) + set(CPACK_PACKAGE_VERSION_PATCH ${LINPHONE_MICRO_VERSION}) + endif () + set(CPACK_PACKAGE_EXECUTABLES "${EXECUTABLE_NAME};${APPLICATION_NAME}") + set(CPACK_RESOURCE_FILE_LICENSE "${LINPHONE_DESKTOP_DIR}/../LICENSE.txt") + set(CPACK_PACKAGE_INSTALL_DIRECTORY "${APPLICATION_NAME}") + set(CPACK_PACKAGE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/Packages") + set(CPACK_PACKAGE_ICON "${LINPHONE_DESKTOP_DIR}/assets/icon.ico") + + if (APPLE) + set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${LINPHONE_GIT_REVISION}-mac") + set(CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/macos/background_dmg.jpg") + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/macos/linphone_dmg.scpt.in" "linphone_dmg.scpt" @ONLY) + set(CPACK_DMG_DS_STORE_SETUP_SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/linphone_dmg.scpt") + set(CPACK_BINARY_DRAGNDROP ON) + elseif(NOT(WIN32)) + set(CPACK_BINARY_TGZ ON) + else() + set(CPACK_GENERATOR "NSIS") + set(DO_GENERATOR YES) + set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${LINPHONE_GIT_REVISION}-win32") + string(COMPARE EQUAL ${CPACK_GENERATOR} "NSIS" IS_NSIS) + if (${IS_NSIS}) + set(PACKAGE_EXT "exe") + # Use magic `NSIS.template.in` template from the current source directory to force uninstallation + # and ensure that linphone is not running before installation. + set(CPACK_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/windows") + set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\windows\\\\nsis_banner.bmp") + set(CPACK_NSIS_MUI_ICON "${LINPHONE_DESKTOP_DIR}/assets/icon.ico") + set(CPACK_NSIS_MUI_UNIICON "${LINPHONE_DESKTOP_DIR}/assets/icon.ico") + set(CPACK_NSIS_DISPLAY_NAME "${APPLICATION_NAME}") + if (LINPHONE_MICRO_VERSION) + set(CPACK_NSIS_PACKAGE_NAME "${APPLICATION_NAME} ${LINPHONE_MAJOR_VERSION}.${LINPHONE_MINOR_VERSION}.${LINPHONE_MICRO_VERSION}") + else () + set(CPACK_NSIS_PACKAGE_NAME "${APPLICATION_NAME} ${LINPHONE_MAJOR_VERSION}.${LINPHONE_MINOR_VERSION}") + endif () + set(CPACK_NSIS_URL_INFO_ABOUT ${APPLICATION_URL}) + + file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}" DOS_STYLE_BINARY_DIR) + string(REPLACE "\\" "\\\\" ESCAPED_DOS_STYLE_BINARY_DIR "${DOS_STYLE_BINARY_DIR}") + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/windows/install.nsi.in" "${CMAKE_CURRENT_BINARY_DIR}/install.nsi" @ONLY) + set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "!include \\\"${ESCAPED_DOS_STYLE_BINARY_DIR}\\\\install.nsi\\\"") + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/windows/uninstall.nsi.in" "${CMAKE_CURRENT_BINARY_DIR}/uninstall.nsi" COPYONLY) + set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "!include \\\"${ESCAPED_DOS_STYLE_BINARY_DIR}\\\\uninstall.nsi\\\"") + else () + set(PACKAGE_EXT "msi") + + set(CPACK_WIX_UPGRADE_GUID "C748668E-53D0-4088-A548-E33A76615A3B") + set(CPACK_WIX_PRODUCT_ICON "${LINPHONE_DESKTOP_DIR}/assets/icon.ico") + set(CPACK_WIX_PROPERTY_ARPURLINFOABOUT "${APPLICATION_URL}") + + # TODO: Deal with install/uninstall.nsi + endif () + + # Sign the installer. + set(TIMESTAMP_URL "http://timestamp.verisign.com/scripts/timestamp.dll") + set(PFX_FILE "${CMAKE_CURRENT_SOURCE_DIR}/sign/linphone.pfx") + set(PASSPHRASE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/sign/passphrase.txt") + get_filename_component(WINSDK_DIR "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows;CurrentInstallFolder]" REALPATH CACHE) + find_package(PythonInterp) + find_program(SIGNTOOL signtool PATHS ${WINSDK_DIR}/${CMAKE_INSTALL_BINDIR}) + set(SIGNTOOL_COMMAND "${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/windows/signtool.py") + set(PERFORM_SIGNING 0) + if (EXISTS ${PFX_FILE}) + if (SIGNTOOL) + set(SIGNTOOL_COMMAND "${SIGNTOOL_COMMAND} signtool sign /f ${PFX_FILE}") + set(SIGNTOOL_COMMAND "${SIGNTOOL_COMMAND} /p ${PASSPHRASE_FILE}") + set(SIGNTOOL_COMMAND "${SIGNTOOL_COMMAND} /t ${TIMESTAMP_URL}") + message("Found signtool and certificate ${PFX_FILE}") + set(PERFORM_SIGNING 1) + else () + message(STATUS "Could not find signtool! Code signing disabled (${SIGNTOOL})") + endif () + else () + message(STATUS "No signtool certificate found; assuming development machine (${PFX_FILE})") + endif () + endif () + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/packaging.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/packaging.cmake" @ONLY) + install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/packaging.cmake") + include(CPack) +endif() diff --git a/linphone-desktop/cmake_builder/linphone_package/macos/packaging.cmake.in b/linphone-desktop/cmake_builder/linphone_package/macos/packaging.cmake.in deleted file mode 100644 index 8ed4e14c1..000000000 --- a/linphone-desktop/cmake_builder/linphone_package/macos/packaging.cmake.in +++ /dev/null @@ -1,31 +0,0 @@ -############################################################################ -# packaging.cmake -# Copyright (C) 2017-2018 Belledonne Communications, Grenoble France -# -############################################################################ -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -############################################################################ - -if (NOT "${CMAKE_INSTALL_PREFIX}" MATCHES .*/_CPack_Packages/.*) - execute_process( - COMMAND ${CMAKE_CPACK_COMMAND} -G DragNDrop - RESULT_VARIABLE CPACK_COMMAND_RESULT - ) - if(CPACK_COMMAND_RESULT) - message(FATAL_ERROR "Failed to create dmg package!") - endif() -endif () diff --git a/linphone-desktop/cmake_builder/linphone_package/packaging.cmake.in b/linphone-desktop/cmake_builder/linphone_package/packaging.cmake.in new file mode 100644 index 000000000..0026d703a --- /dev/null +++ b/linphone-desktop/cmake_builder/linphone_package/packaging.cmake.in @@ -0,0 +1,70 @@ +############################################################################ +# packaging.cmake +# Copyright (C) 2017-2018 Belledonne Communications, Grenoble France +# +############################################################################ +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +############################################################################ +set(DO_TGZ @CPACK_BINARY_TGZ@) +set(DO_TZ @CPACK_BINARY_TZ@) +set(DO_STGZ @CPACK_BINARY_STGZ@) +set(DO_DRAGANDDROP @CPACK_BINARY_DRAGNDROP@) +set(DO_GENERATOR @DO_GENERATOR@) + + +if (NOT "${CMAKE_INSTALL_PREFIX}" MATCHES .*/_CPack_Packages/.*) + if(DO_TGZ) + execute_process( COMMAND ${CMAKE_CPACK_COMMAND} -G TGZ RESULT_VARIABLE CPACK_COMMAND_RESULT) + if(CPACK_COMMAND_RESULT) + message(FATAL_ERROR "Failed to create TGZ package!") + endif() + endif() + if(DO_TZ) + execute_process( COMMAND ${CMAKE_CPACK_COMMAND} -G TZ RESULT_VARIABLE CPACK_COMMAND_RESULT) + if(CPACK_COMMAND_RESULT) + message(FATAL_ERROR "Failed to create TZ package!") + endif() + endif() + if(DO_STGZ) + execute_process( COMMAND ${CMAKE_CPACK_COMMAND} -G STGZ RESULT_VARIABLE CPACK_COMMAND_RESULT) + if(CPACK_COMMAND_RESULT) + message(FATAL_ERROR "Failed to create STGZ package!") + endif() + endif() + if(DO_DRAGANDDROP) + execute_process( COMMAND ${CMAKE_CPACK_COMMAND} -G DragAndDrop RESULT_VARIABLE CPACK_COMMAND_RESULT) + if(CPACK_COMMAND_RESULT) + message(FATAL_ERROR "Failed to create DragAndDrop package!") + endif() + endif() + if(DO_GENERATOR) + execute_process( COMMAND ${CMAKE_CPACK_COMMAND} -G @CPACK_GENERATOR@ RESULT_VARIABLE CPACK_COMMAND_RESULT) + if(CPACK_COMMAND_RESULT) + message(FATAL_ERROR "Failed to create @CPACK_GENERATOR@ package!") + endif() + endif() + if (@PERFORM_SIGNING@) + execute_process( + COMMAND @SIGNTOOL_COMMAND@ @CMAKE_CURRENT_BINARY_DIR@/@CPACK_PACKAGE_FILE_NAME@.@PACKAGE_EXT@ + RESULT_VARIABLE SIGNING_RESULT + ) + if(SIGNING_RESULT) + message(FATAL_ERROR "Failed to sign the package!") + endif() + endif () + +endif () diff --git a/linphone-desktop/cmake_builder/linphone_package/windows/packaging.cmake.in b/linphone-desktop/cmake_builder/linphone_package/windows/packaging.cmake.in deleted file mode 100644 index 2bd39ba9f..000000000 --- a/linphone-desktop/cmake_builder/linphone_package/windows/packaging.cmake.in +++ /dev/null @@ -1,41 +0,0 @@ -############################################################################ -# packaging.cmake -# Copyright (C) 2014-2018 Belledonne Communications, Grenoble France -# -############################################################################ -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -############################################################################ - -if (NOT "${CMAKE_INSTALL_PREFIX}" MATCHES .*/_CPack_Packages/.*) - execute_process( - COMMAND ${CMAKE_CPACK_COMMAND} -G @CPACK_GENERATOR@ - RESULT_VARIABLE CPACK_COMMAND_RESULT - ) - if(CPACK_COMMAND_RESULT) - message(FATAL_ERROR "Failed to generate package!") - endif() - - if (@PERFORM_SIGNING@) - execute_process( - COMMAND @SIGNTOOL_COMMAND@ @CMAKE_CURRENT_BINARY_DIR@/@CPACK_PACKAGE_FILE_NAME@.@PACKAGE_EXT@ - RESULT_VARIABLE SIGNING_RESULT - ) - if(SIGNING_RESULT) - message(FATAL_ERROR "Failed to sign the package!") - endif() - endif () -endif () diff --git a/linphone-sdk b/linphone-sdk index 473601ccb..b1b8f63c3 160000 --- a/linphone-sdk +++ b/linphone-sdk @@ -1 +1 @@ -Subproject commit 473601ccb3de584acebf7e5dff0752d8e7cf8991 +Subproject commit b1b8f63c3b7629950a2689303792836f73e0b1b7 From df1cadde824940dcc75b8027981633597c2ab5c8 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Tue, 24 Mar 2020 23:29:37 +0100 Subject: [PATCH 03/20] fix CI files and licence path --- .gitlab-ci-files/job-linux-archlinux.yml | 51 ----------- .gitlab-ci-files/job-linux-centos7.yml | 79 ---------------- .gitlab-ci-files/job-linux-debian8.yml | 51 ----------- .gitlab-ci-files/job-linux-debian9.yml | 51 ----------- .gitlab-ci-files/job-linux-desktop.yml | 16 +--- .gitlab-ci-files/job-linux-ubuntu.yml | 51 ----------- .gitlab-ci-files/job-linux.yml | 66 -------------- .gitlab-ci-files/job-macosx-desktop.yml | 27 ++---- .gitlab-ci-files/job-macosx.yml | 91 ------------------- .gitlab-ci-files/job-windows-desktop.yml | 35 ++----- .gitlab-ci-files/job-windows.yml | 36 -------- CMakeLists.txt | 4 +- linphone-desktop/build/CMakeLists.txt | 2 +- .../linphone_package/CMakeLists.txt | 2 +- 14 files changed, 28 insertions(+), 534 deletions(-) delete mode 100644 .gitlab-ci-files/job-linux-archlinux.yml delete mode 100644 .gitlab-ci-files/job-linux-centos7.yml delete mode 100644 .gitlab-ci-files/job-linux-debian8.yml delete mode 100644 .gitlab-ci-files/job-linux-debian9.yml delete mode 100644 .gitlab-ci-files/job-linux-ubuntu.yml delete mode 100644 .gitlab-ci-files/job-linux.yml delete mode 100644 .gitlab-ci-files/job-macosx.yml delete mode 100644 .gitlab-ci-files/job-windows.yml diff --git a/.gitlab-ci-files/job-linux-archlinux.yml b/.gitlab-ci-files/job-linux-archlinux.yml deleted file mode 100644 index 9dedf4a90..000000000 --- a/.gitlab-ci-files/job-linux-archlinux.yml +++ /dev/null @@ -1,51 +0,0 @@ -################################################# -# Makefile -################################################# - -job-archlinux-latest-makefile-gcc: - - tags: [ "docker-archlinux-latest" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:latest - variables: - CMAKE_GENERATOR: Unix Makefiles - CC: gcc - CXX: g++ - ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS - extends: .scheduled-job-linux-desktop - - -job-archlinux-latest-makefile-clang: - - tags: [ "docker-archlinux-latest" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:latest - variables: - CMAKE_GENERATOR: Unix Makefiles - CC: clang - CXX: clang++ - ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS - extends: .scheduled-job-linux-desktop - -################################################# -# Ninja -################################################# - -job-archlinux-latest-ninja-gcc: - - tags: [ "docker-archlinux-latest" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:latest - variables: - CMAKE_GENERATOR: Ninja - CC: gcc - CXX: g++ - extends: .job-linux-desktop - - -job-archlinux-latest-ninja-clang: - - tags: [ "docker-archlinux-latest" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:latest - variables: - CMAKE_GENERATOR: Ninja - CC: clang - CXX: clang++ - extends: .job-linux-desktop \ No newline at end of file diff --git a/.gitlab-ci-files/job-linux-centos7.yml b/.gitlab-ci-files/job-linux-centos7.yml deleted file mode 100644 index cfcb4d6b9..000000000 --- a/.gitlab-ci-files/job-linux-centos7.yml +++ /dev/null @@ -1,79 +0,0 @@ -################################################# -# Makefile -################################################# - -job-centos7-makefile-gcc: - - tags: [ "docker-centos7" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos:7 - variables: - CMAKE_GENERATOR: Unix Makefiles - CC: gcc - CXX: g++ - ADDITIONAL_BUILD_OPTIONS: -j1 - extends: .job-linux-desktop - - -job-centos7-makefile-clang: - - tags: [ "docker-centos7" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos:7 - variables: - CMAKE_GENERATOR: Unix Makefiles - CC: clang - CXX: clang++ - ADDITIONAL_BUILD_OPTIONS: -j1 - extends: .job-linux-desktop - -################################################# -# Ninja -################################################# - -#job-centos7-ninja-gcc: -# -# tags: [ "docker-centos7" ] -# image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos:7 -# variables: -# CMAKE_GENERATOR: Ninja -# CC: gcc -# CXX: g++ -# extends: .job-linux-desktop - - -#job-centos7-ninja-clang: -# -# tags: [ "docker-centos7" ] -# image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos:7 -# variables: -# CMAKE_GENERATOR: Ninja -# CC: clang -# CXX: clang++ -# extends: .job-linux-desktop - -################################################# -# RPM -################################################# - -job-centos7-rpm: - - tags: [ "docker-centos7" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos:7 - extends: .job-linux-rpm - -################################################# -# Deploy -################################################# - -job-centos7-rpm-deploy: - - stage: deploy - tags: [ "deploy-linux" ] - - only: - - schedules - dependencies: - - job-centos7-rpm - - script: - - cd WORK/desktop-rpm/rpmbuild/RPMS/x86_64/ && rsync -pr . $DEPLOY_SERVER:$CENTOS7_DEPLOY_DIRECTORY - - ssh $DEPLOY_SERVER "chmod a+r $CENTOS7_DEPLOY_DIRECTORY/*.rpm && createrepo_c --update $CENTOS7_DEPLOY_DIRECTORY/." \ No newline at end of file diff --git a/.gitlab-ci-files/job-linux-debian8.yml b/.gitlab-ci-files/job-linux-debian8.yml deleted file mode 100644 index 346ea4f19..000000000 --- a/.gitlab-ci-files/job-linux-debian8.yml +++ /dev/null @@ -1,51 +0,0 @@ -################################################# -# Makefile -################################################# - -job-debian8-makefile-gcc: - - tags: [ "docker-debian8" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:8 - variables: - CMAKE_GENERATOR: Unix Makefiles - CC: gcc - CXX: g++ - ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS - extends: .job-linux-desktop - - -job-debian8-makefile-clang: - - tags: [ "docker-debian8" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:8 - variables: - CMAKE_GENERATOR: Unix Makefiles - CC: clang - CXX: clang++ - ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS - extends: .job-linux-desktop - -################################################# -# Ninja -################################################# - -#job-debian8-ninja-gcc: -# -# tags: [ "docker-debian8" ] -# image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:8 -# variables: -# CMAKE_GENERATOR: Ninja -# CC: gcc -# CXX: g++ -# extends: .job-linux-desktop - - -#job-debian8-ninja-clang: -# -# tags: [ "docker-debian8" ] -# image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:8 -# variables: -# CMAKE_GENERATOR: Ninja -# CC: clang -# CXX: clang++ -# extends: .job-linux-desktop \ No newline at end of file diff --git a/.gitlab-ci-files/job-linux-debian9.yml b/.gitlab-ci-files/job-linux-debian9.yml deleted file mode 100644 index 16a57ae16..000000000 --- a/.gitlab-ci-files/job-linux-debian9.yml +++ /dev/null @@ -1,51 +0,0 @@ -################################################# -# Makefile -################################################# - -job-debian9-makefile-gcc: - - tags: [ "docker-debian9" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9 - variables: - CMAKE_GENERATOR: Unix Makefiles - CC: gcc - CXX: g++ - ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS - extends: .scheduled-job-linux-desktop - - -job-debian9-makefile-clang: - - tags: [ "docker-debian9" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9 - variables: - CMAKE_GENERATOR: Unix Makefiles - CC: clang - CXX: clang++ - ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS - extends: .scheduled-job-linux-desktop - -################################################# -# Ninja -################################################# - -job-debian9-ninja-gcc: - - tags: [ "docker-debian9" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9 - variables: - CMAKE_GENERATOR: Ninja - CC: gcc - CXX: g++ - extends: .job-linux-desktop - - -job-debian9-ninja-clang: - - tags: [ "docker-debian9" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9 - variables: - CMAKE_GENERATOR: Ninja - CC: clang - CXX: clang++ - extends: .job-linux-desktop \ No newline at end of file diff --git a/.gitlab-ci-files/job-linux-desktop.yml b/.gitlab-ci-files/job-linux-desktop.yml index e00ab5453..31705d7dd 100644 --- a/.gitlab-ci-files/job-linux-desktop.yml +++ b/.gitlab-ci-files/job-linux-desktop.yml @@ -11,26 +11,18 @@ - cmake --version - export CC=$CC - export CXX=$CXX - - mkdir -p build-desktop/OUTPUT + - mkdir -p build/OUTPUT - echo $CMAKE_GENERATOR - echo $DEFAULT_LINUX_CMAKE_OPTIONS - echo $CMAKE_OPTIONS - echo $CMAKE_SANITIZER_OPTIONS # SDK Building - - cd build-desktop + - cd build - cmake .. -G "$CMAKE_GENERATOR" -DCMAKE_VERBOSE_MAKEFILE=ON -DLINPHONESDK_PLATFORM=Desktop $DEFAULT_LINUX_CMAKE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS $CMAKE_SANITIZER_OPTIONS - - cmake --build . --target sdk $LBC_NODEBUG_OPTIONS -# Minizip install to OUTPUT folder - - cmake .. - - cmake --build . --target minizip $LBC_NODEBUG_OPTIONS - - cmake --build . --target install $LBC_NODEBUG_OPTIONS -# Update CMake installation - - cmake .. -G "$CMAKE_GENERATOR" $DEFAULT_LINUX_CMAKE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS $CMAKE_SANITIZER_OPTIONS - - cmake --build . --target linphone-qt $LBC_NODEBUG_OPTIONS - - cmake --build . --target install + - cmake --build . --target all $LBC_NODEBUG_OPTIONS artifacts: paths: - - build-desktop/OUTPUT + - build/OUTPUT expire_in: 1 week diff --git a/.gitlab-ci-files/job-linux-ubuntu.yml b/.gitlab-ci-files/job-linux-ubuntu.yml deleted file mode 100644 index 3dde1fdbc..000000000 --- a/.gitlab-ci-files/job-linux-ubuntu.yml +++ /dev/null @@ -1,51 +0,0 @@ -################################################# -# Makefile -################################################# - -job-ubuntu-rolling-makefile-gcc: - - tags: [ "docker-ubuntu-rolling" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling - variables: - CMAKE_GENERATOR: Unix Makefiles - CC: gcc - CXX: g++ - ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS - extends: .scheduled-job-linux-desktop - - -job-ubuntu-rolling-makefile-clang: - - tags: [ "docker-ubuntu-rolling" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling - variables: - CMAKE_GENERATOR: Unix Makefiles - CC: clang - CXX: clang++ - ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS - extends: .scheduled-job-linux-desktop - -################################################# -# Ninja -################################################# - -job-ubuntu-rolling-ninja-gcc: - - tags: [ "docker-ubuntu-rolling" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling - variables: - CMAKE_GENERATOR: Ninja - CC: gcc - CXX: g++ - extends: .job-linux-desktop - - -job-ubuntu-rolling-ninja-clang: - - tags: [ "docker-ubuntu-rolling" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling - variables: - CMAKE_GENERATOR: Ninja - CC: clang - CXX: clang++ - extends: .job-linux-desktop \ No newline at end of file diff --git a/.gitlab-ci-files/job-linux.yml b/.gitlab-ci-files/job-linux.yml deleted file mode 100644 index 6a9814f24..000000000 --- a/.gitlab-ci-files/job-linux.yml +++ /dev/null @@ -1,66 +0,0 @@ -################################################# -# Ccache -################################################# - -.linux-ccache: - - cache: - key: $CI_JOB_NAME - paths: - - ccache/ - - before_script: - - mkdir -p ccache - - echo "max_size = $CCACHE_SIZE" > ccache/ccache.conf - - export CCACHE_BASEDIR=${PWD} - - export CCACHE_DIR=${PWD}/ccache - - ccache -s - - after_script: - - export CCACHE_DIR=${PWD}/ccache - - ccache -s - -################################################# -# Job -################################################# - -.job-linux-desktop: - - stage: build - - extends: .linux-ccache - - script: - - export CC=$CC - - export CXX=$CXX - - ./prepare.py -G "$CMAKE_GENERATOR" -cc $DEFAULT_LINUX_CMAKE_OPTIONS $CMAKE_OPTIONS - - cmake --build WORK/desktop/cmake -- $ADDITIONAL_BUILD_OPTIONS - -################################################# -# RPM -################################################# - -.job-linux-rpm: - - stage: package - - script: - - sudo rpm -i --replacepkgs /linphone-qt-* - - ./prepare.py desktop-rpm $DEFAULT_CMAKE_OPTIONS $CMAKE_OPTIONS - - make - - artifacts: - paths: - - WORK/desktop-rpm/rpmbuild/RPMS/x86_64/*.rpm - when: always - expire_in: 1 week - -################################################# -# Schedule -################################################# - -.scheduled-job-linux-desktop: - - extends: .job-linux-desktop - only: - - schedules \ No newline at end of file diff --git a/.gitlab-ci-files/job-macosx-desktop.yml b/.gitlab-ci-files/job-macosx-desktop.yml index 028abf981..6813a89d5 100644 --- a/.gitlab-ci-files/job-macosx-desktop.yml +++ b/.gitlab-ci-files/job-macosx-desktop.yml @@ -7,24 +7,16 @@ ccache -s export Qt5_DIR=/usr/local/opt/qt/lib/cmake export PATH=$PATH:/usr/local/opt/qt/bin - if [ -d "build-desktop" ]; then rm -rf build-desktop; fi; - mkdir -p build-desktop/OUTPUT - cd build-desktop + if [ -d "build" ]; then rm -rf build; fi; + mkdir -p build/OUTPUT + cd build #SDK Building echo $CMAKE_GENERATOR echo $DEFAULT_MACOS_CMAKE_OPTIONS echo $CMAKE_OPTIONS echo $ADDITIONAL_BUILD_OPTIONS cmake .. -G "$CMAKE_GENERATOR" -DLINPHONESDK_PLATFORM=Desktop -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 $DEFAULT_MACOS_CMAKE_OPTIONS $XCODE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS - cmake --build . --target sdk $LBC_NODEBUG_OPTIONS -- $ADDITIONAL_BUILD_OPTIONS - # Minizip install to OUTPUT folder - cmake .. - cmake --build . --target minizip - cmake --build . --target install - # Update CMake installation - cmake .. -G "$CMAKE_GENERATOR" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 $DEFAULT_MACOS_CMAKE_OPTIONS $XCODE_OPTIONS $CMAKE_OPTIONS - cmake --build . --target linphone-qt -- $ADDITIONAL_BUILD_OPTIONS - cmake --build . --target install -- $ADDITIONAL_BUILD_OPTIONS + cmake --build . --target all $LBC_NODEBUG_OPTIONS -- $ADDITIONAL_BUILD_OPTIONS ccache -s .job-macosx-desktop: @@ -34,7 +26,7 @@ - *build_all_script artifacts: paths: - - build-desktop/OUTPUT + - build/OUTPUT expire_in: 1 week ################################################# @@ -91,14 +83,15 @@ job-macosx-makefile-package: only: variables: - $NIGHTLY_MASTER + variables: + CMAKE_OPTIONS: -DENABLE_PACKAGING=YES extends: job-macosx-makefile script: - *build_all_script - - cmake --build . --target package -- $ADDITIONAL_BUILD_OPTIONS - - codesign --verbose -s "$MACOS_SIGNING_IDENTITY" CPackBuild/Linphone*.dmg + - codesign --verbose -s "$MACOS_SIGNING_IDENTITY" OUTPUT/Packages/Linphone*.dmg artifacts: paths: - - build-desktop/CPackBuild/Linphone*.dmg + - build/OUTPUT/Packages/Linphone*.dmg expire_in: 1 week ################################################# @@ -114,4 +107,4 @@ job-macosx-makefile-deploy: variables: - $NIGHTLY_MASTER script: - - scp build-desktop/CPackBuild/Linphone*.dmg $DEPLOY_SERVER:$MACOSX_UPLOAD_DIRECTORY/app/ + - scp build/OUTPUT/Packages/Linphone*.dmg $DEPLOY_SERVER:$MACOSX_UPLOAD_DIRECTORY/app/ diff --git a/.gitlab-ci-files/job-macosx.yml b/.gitlab-ci-files/job-macosx.yml deleted file mode 100644 index 1f54baae4..000000000 --- a/.gitlab-ci-files/job-macosx.yml +++ /dev/null @@ -1,91 +0,0 @@ - -.job-macosx: - - stage: build - - tags: [ "macosx" ] - - script: - - ccache -s - - export Qt5_DIR=/usr/local/opt/qt/lib/cmake - - export PATH=$PATH:/usr/local/opt/qt/bin - - python prepare.py -G "$CMAKE_GENERATOR" -cc --package -DLINPHONE_BUILDER_SIGNING_IDENTITY="$MACOS_SIGNING_IDENTITY" $DEFAULT_MACOS_CMAKE_OPTIONS $CMAKE_OPTIONS - - cmake --build WORK/desktop/cmake -- $ADDITIONAL_BUILD_OPTIONS - - codesign --verbose -s "$MACOS_SIGNING_IDENTITY" WORK/desktop/Build/linphone_package/Linphone-*.dmg - - ccache -s - - artifacts: - paths: - - WORK/desktop/Build/linphone_package/$PACKAGE_NAME-*.dmg - - WORK/desktop/Build/linphone_package/linphone-sdk-*-mac.zip - when: always - expire_in: 1 week - - -.scheduled-job-macosx: - - extends: .job-macosx - only: - - schedules - - -################################################# -# Makefile -################################################# - -job-macosx-makefile: - - variables: - CMAKE_GENERATOR: Unix Makefiles - ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS - extends: .scheduled-job-macosx - -################################################# -# Ninja -################################################# - -job-macosx-ninja: - - variables: - CMAKE_GENERATOR: Ninja - extends: .job-macosx - -################################################# -# Xcode -################################################# - -job-macosx-xcode: - - stage: build - - tags: [ "macosx" ] - - only: - - schedules - script: - - export Qt5_DIR=/usr/local/opt/qt/lib/cmake - - export PATH=$PATH:/usr/local/opt/qt/bin - - python prepare.py -G Xcode -cc --package $DEFAULT_MACOS_CMAKE_OPTIONS $CMAKE_OPTIONS - - cmake --build WORK/desktop/cmake -- -IDEBuildOperationMaxNumberOfConcurrentCompileTasks=`sysctl -n hw.ncpu` - - artifacts: - paths: - - WORK/desktop/Build/linphone_package/$PACKAGE_NAME-*.dmg - - WORK/desktop/Build/linphone_package/linphone-sdk-*-mac.zip - when: always - expire_in: 1 week - -################################################# -# Deploy -################################################# - -job-macosx-deploy: - - stage: deploy - tags: [ "deploy" ] - - dependencies: - - job-macosx-ninja - - script: - - scp WORK/desktop/Build/linphone_package/$PACKAGE_NAME-*-mac.dmg $DEPLOY_SERVER:$MACOSX_UPLOAD_DIRECTORY/ diff --git a/.gitlab-ci-files/job-windows-desktop.yml b/.gitlab-ci-files/job-windows-desktop.yml index efdbf1659..be904b705 100644 --- a/.gitlab-ci-files/job-windows-desktop.yml +++ b/.gitlab-ci-files/job-windows-desktop.yml @@ -54,9 +54,9 @@ script: - SET Qt5_DIR=C:\Qt\5.12.6\msvc2017\lib\cmake - SET PATH=%PATH%;C:\Qt\5.12.6\msvc2017\bin - - IF EXIST build-desktop RMDIR /S /Q build-desktop - - mkdir build-desktop - - cd build-desktop + - IF EXIST build RMDIR /S /Q build + - mkdir build + - cd build - mkdir OUTPUT #SDK Building #we launch the msvc-cl wrapper located in python scripts folder @@ -65,19 +65,11 @@ - C:\PROGRA~1\Python37\Scripts\cl -s - cmake .. -G "Visual Studio 15 2017" -DLINPHONESDK_PLATFORM=Desktop -DENABLE_CSHARP_WRAPPER=YES -DCMAKE_BUILD_TYPE=Release %DEFAULT_WINDOWS_CMAKE_OPTIONS% %CMAKE_OPTIONS% - cmake --build . --target ALL_BUILD --config Release %LBC_NODEBUG_OPTIONS% -- /maxcpucount /nodeReuse:true /p:TrackFileAccess=false -# Minizip install to OUTPUT folder - - cmake .. - - cmake --build . --target minizip - - cmake --build . --target install --config Release %LBC_NODEBUG_OPTIONS% -- /maxcpucount /nodeReuse:true /p:TrackFileAccess=false -# Update CMake installation - - cmake .. -G "Visual Studio 15 2017" -DCMAKE_BUILD_TYPE=Release %DEFAULT_WINDOWS_CMAKE_OPTIONS% %CMAKE_OPTIONS% - - cmake --build . --target linphone-qt --config Release -- /maxcpucount /nodeReuse:true /p:TrackFileAccess=false - - cmake --build . --target install --config Release -- /maxcpucount /nodeReuse:true /p:TrackFileAccess=false - C:\PROGRA~1\Python37\Scripts\cl -s artifacts: paths: - - build-desktop\OUTPUT + - build\OUTPUT expire_in: 2 days .job-windows-vs2017-scheduled: @@ -124,28 +116,21 @@ job-windows-vs2017-package: script: - SET Qt5_DIR=C:\Qt\5.12.6\msvc2017\lib\cmake - SET PATH=%PATH%;C:\Qt\5.12.6\msvc2017\bin - - IF EXIST build-desktop RMDIR /S /Q build-desktop - - mkdir build-desktop - - cd build-desktop + - IF EXIST build RMDIR /S /Q build + - mkdir build + - cd build - mkdir OUTPUT #SDK Building #we launch the msvc-cl wrapper located in python scripts folder #this wrapper relays only needed calls to the real compiler #cache stats display - C:\PROGRA~1\Python37\Scripts\cl -s - - cmake .. -G "Visual Studio 15 2017" -DLINPHONESDK_PLATFORM=Desktop -DENABLE_CSHARP_WRAPPER=YES -DCMAKE_BUILD_TYPE=Release %DEFAULT_WINDOWS_CMAKE_OPTIONS% %CMAKE_OPTIONS% + - cmake .. -G "Visual Studio 15 2017" -DLINPHONESDK_PLATFORM=Desktop -DENABLE_CSHARP_WRAPPER=YES -DCMAKE_BUILD_TYPE=Release -DENABLE_PACKAGING=YES %DEFAULT_WINDOWS_CMAKE_OPTIONS% %CMAKE_OPTIONS% - cmake --build . --target ALL_BUILD --config Release %LBC_NODEBUG_OPTIONS% -- /maxcpucount /nodeReuse:true /p:TrackFileAccess=false -# Minizip install to OUTPUT folder - - cmake .. - - cmake --build . --target minizip - - cmake --build . --target install --config Release %LBC_NODEBUG_OPTIONS% -- /maxcpucount /nodeReuse:true /p:TrackFileAccess=false -# Update CMake installation - - cmake .. -G "Visual Studio 15 2017" -DCMAKE_BUILD_TYPE=Release %DEFAULT_WINDOWS_CMAKE_OPTIONS% %CMAKE_OPTIONS% - - cmake --build . --target linphone-qt --config Release -- /maxcpucount /nodeReuse:true /p:TrackFileAccess=false - - cmake --build . --target package --config Release -- /maxcpucount /nodeReuse:true /p:TrackFileAccess=false - C:\PROGRA~1\Python37\Scripts\cl -s - mkdir "%CI_PROJECT_DIR%/results" - - cd CPackBuild + - cd OUTPUT + - cd Packages - copy /B *.exe "%CI_PROJECT_DIR%/results" artifacts: diff --git a/.gitlab-ci-files/job-windows.yml b/.gitlab-ci-files/job-windows.yml deleted file mode 100644 index a7532d539..000000000 --- a/.gitlab-ci-files/job-windows.yml +++ /dev/null @@ -1,36 +0,0 @@ -################################################# -# Visual Studio 2015 -################################################# - -job-windows-vs2015: - - stage: build - - tags: [ "windows" ] - - script: - - echo %Qt5_DIR% - - echo %PATH% - - if DEFINED WINDOWS_SIGNING_DIRECTORY ( xcopy /I /Y "%WINDOWS_SIGNING_DIRECTORY%" "cmake_builder\\linphone_package\\sign" ) - - python prepare.py -G "Visual Studio 14 2015" --package %DEFAULT_WINDOWS_CMAKE_OPTIONS% %CMAKE_OPTIONS% - - cmake --build WORK/desktop/cmake --config Release -- /maxcpucount - - artifacts: - paths: - - WORK/desktop/Build/linphone_package/%PACKAGE_NAME%-*-win32.exe - expire_in: 1 week - -################################################# -# Deploy -################################################# - -job-windows-deploy: - - stage: deploy - tags: [ "deploy" ] - - dependencies: - - job-windows-vs2015 - - script: - - scp WORK/desktop/Build/linphone_package/$PACKAGE_NAME-*-win32.exe $DEPLOY_SERVER:$WINDOWS_UPLOAD_DIRECTORY/ \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index d914c67a0..a7455821f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,7 +68,7 @@ endif() # SET OPTIONS #------------------------------------------------------------------------------- -option(ENABLE_PACKAGING "Enable packaging" NO) +option(ENABLE_APP_PACKAGING "Enable packaging" NO) option(ENABLE_UPDATE_CHECK "Enable update check." NO) option(ENABLE_UNIT_TESTS "Enable unit test of SDK." NO ) option(ENABLE_TESTS "Build with testing binaries of SDK" NO ) @@ -87,7 +87,7 @@ endif() option(ENABLE_RELATIVE_PREFIX "Set Internal packages relative to the binary" YES) set(ALL_OPTIONS "-DENABLE_UPDATE_CHECK=${ENABLE_UPDATE_CHECK}") -list(APPEND ALL_OPTIONS "-DENABLE_PACKAGING=${ENABLE_PACKAGING}") +list(APPEND ALL_OPTIONS "-DENABLE_APP_PACKAGING=${ENABLE_APP_PACKAGING}") list(APPEND ALL_OPTIONS "-DENABLE_UNIT_TESTS=${ENABLE_UNIT_TESTS}") list(APPEND ALL_OPTIONS "-DENABLE_TESTS=${ENABLE_TESTS}") list(APPEND ALL_OPTIONS "-DENABLE_TESTS_COMPONENTS=${ENABLE_TESTS_COMPONENTS}") diff --git a/linphone-desktop/build/CMakeLists.txt b/linphone-desktop/build/CMakeLists.txt index e8475f09d..13f0f5236 100644 --- a/linphone-desktop/build/CMakeLists.txt +++ b/linphone-desktop/build/CMakeLists.txt @@ -24,7 +24,7 @@ if(NOT CPACK_PACKAGE_NAME) set(CPACK_PACKAGE_NAME "linphone") endif () -set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE.txt") +set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/../../LICENSE.txt") set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR}) diff --git a/linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt b/linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt index 8bb6f2e4e..cb764dadd 100644 --- a/linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt +++ b/linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt @@ -258,7 +258,7 @@ endif () # ============================================================================== # CPack. # ============================================================================== -if(${ENABLE_PACKAGING}) +if(${ENABLE_APP_PACKAGING}) set(CPACK_BINARY_STGZ OFF) set(CPACK_BINARY_TGZ OFF) set(CPACK_BINARY_TZ OFF) From 802f3c0754371fc5c5093b609694a63965940506 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Tue, 24 Mar 2020 23:44:09 +0100 Subject: [PATCH 04/20] Remove config file and fix Mac Minizip link --- linphone-desktop/CMakeLists.txt | 12 +++--------- .../cmake_builder/linphone_package/CMakeLists.txt | 2 -- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/linphone-desktop/CMakeLists.txt b/linphone-desktop/CMakeLists.txt index 710283300..069c2ec28 100644 --- a/linphone-desktop/CMakeLists.txt +++ b/linphone-desktop/CMakeLists.txt @@ -1,4 +1,4 @@ -################################################################################ + ################################################################################ # # Copyright (c) 2017-2020 Belledonne Communications SARL. # @@ -502,14 +502,8 @@ source_group( # Installation # ------------------------------ if(APPLE) - target_link_libraries(${TARGET_NAME} "${MINIZIP_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/libminizip.dylib") - execute_process(COMMAND install_name_tool -id "@executable_path/Frameworks/libminizip.dylib" "${MINIZIP_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/libminizip.dylib") + target_link_libraries(${TARGET_NAME} "${MINIZIP_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libminizip.dylib") + execute_process(COMMAND install_name_tool -id "@executable_path/Frameworks/libminizip.dylib" "${MINIZIP_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libminizip.dylib") elseif(NOT WIN32) # target_link_libraries(${TARGET_NAME} "${MINIZIP_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/libminizip.so") endif() - -if(${CMAKE_GENERATOR} MATCHES "Ninja" OR ${CMAKE_VERSION} VERSION_LESS "3.15.0") -else() -# add_custom_command( TARGET ${TARGET_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} --install ${CMAKE_CURRENT_BINARY_DIR} --config ${CMAKE_BUILD_TYPE}) -# add_custom_command( TARGET ${TARGET_NAME_ONLY} POST_BUILD COMMAND ${CMAKE_COMMAND} --install ${CMAKE_CURRENT_BINARY_DIR} --config ${CMAKE_BUILD_TYPE}) -endif() diff --git a/linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt b/linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt index cb764dadd..620604216 100644 --- a/linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt +++ b/linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt @@ -193,8 +193,6 @@ elseif (APPLE) endif () # install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_NAME}.app" DESTINATION "." USE_SOURCE_PERMISSIONS) - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/macos/packaging.cmake.in" "packaging.cmake" @ONLY) -# install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/packaging.cmake") else()# Not Windows and Apple foreach (LIBRARY ${SHARED_LIBRARIES}) get_filename_component(LIBRARY_FILENAME ${LIBRARY} NAME) From d165a316f7bcd5c7d9aa21a133a4e503fb8fbf3b Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Tue, 24 Mar 2020 23:58:17 +0100 Subject: [PATCH 05/20] Fix installation missing for Windows, Linux and Windows --- .gitignore | 2 +- .../cmake_builder/linphone_package/CMakeLists.txt | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index eaafa02dc..fde0371a9 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,7 @@ CMakeLists.txt.user build-*-Debug build-*-Default prepare.conf.user -build-desktop/* +build/* # Tags ------------------------------------------------------------------------- diff --git a/linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt b/linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt index 620604216..d3df8e7e3 100644 --- a/linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt +++ b/linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt @@ -114,7 +114,7 @@ if (WIN32) endif () file(GLOB GRAMMAR_FILES "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/Belr/grammars/*") install(FILES ${GRAMMAR_FILES} DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/belr/grammars/" ) - install(FILES "${MINIZIP_OUTPUT_DIR}/${CMAKE_INSTALL_BINDIR}/minizip.dll" DESTINATION "${CMAKE_INSTALL_BINDIR}") + install(FILES "${MINIZIP_PREFIX}/${CMAKE_INSTALL_BINDIR}/minizip.dll" DESTINATION "${CMAKE_INSTALL_BINDIR}") install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/images" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}" USE_SOURCE_PERMISSIONS OPTIONAL) install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/sounds" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}" USE_SOURCE_PERMISSIONS) install(FILES "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/Linphone/rootca.pem" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${EXECUTABLE_NAME}/") @@ -152,7 +152,7 @@ elseif (APPLE) if (EXISTS "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/mediastreamer") file(COPY "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/mediastreamer" DESTINATION "${APPLICATION_NAME}.app/Contents/Resources/${CMAKE_INSTALL_LIBDIR}" USE_SOURCE_PERMISSIONS) endif () - install(FILES "${MINIZIP_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/libminizip.dylib" DESTINATION "${APPLICATION_NAME}.app/Contents/Frameworks/") + install(FILES "${MINIZIP_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libminizip.dylib" DESTINATION "${APPLICATION_NAME}.app/Contents/Frameworks/") file(GLOB GRAMMAR_FILES "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/Belr/grammars/*") install(FILES ${GRAMMAR_FILES} DESTINATION "${APPLICATION_NAME}.app/Contents/Resources/${CMAKE_INSTALL_DATAROOTDIR}/belr/grammars/") install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/images" DESTINATION "${APPLICATION_NAME}.app/Contents/Resources/${CMAKE_INSTALL_DATAROOTDIR}" USE_SOURCE_PERMISSIONS OPTIONAL) @@ -201,6 +201,7 @@ else()# Not Windows and Apple endforeach () message(${CMAKE_INSTALL_PREFIX}) install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_BINDIR}/" DESTINATION "${CMAKE_INSTALL_BINDIR}" USE_SOURCE_PERMISSIONS) + #Just in case. This is useless because we have to use CMAKE_INSTALL_LIBDIR if( EXISTS "${LINPHONE_OUTPUT_DIR}/lib/") install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/lib/" DESTINATION "lib" USE_SOURCE_PERMISSIONS) @@ -215,6 +216,7 @@ else()# Not Windows and Apple if (EXISTS "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/mediastreamer") file(COPY "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/mediastreamer" DESTINATION "${CMAKE_INSTALL_LIBDIR}" USE_SOURCE_PERMISSIONS) endif () + install(FILES "${MINIZIP_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libminizip.so" DESTINATION "${CMAKE_INSTALL_LIBDIR}") install(FILES "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/belr/grammars/cpim_grammar" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/belr/grammars/") install(FILES "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/belr/grammars/vcard_grammar" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/belr/grammars/") install(FILES "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/linphone/rootca.pem" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${APPLICATION_NAME}") #We use executable_name because of name folder that is not harmonized from the SDK From bd283bee98d95a493b162db48540ff09de431db1 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Wed, 25 Mar 2020 10:08:02 +0100 Subject: [PATCH 06/20] Change variable name to APP_OPTIONS, use sdk function to pass CMAKE arguments to external project, specify parallel build while configuring the project --- CMakeLists.txt | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a7455821f..b437bae29 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,7 +43,6 @@ set(MINIZIP_BUILD_DIR "${CMAKE_BINARY_DIR}/minizip_BUILD") set(MINIZIP_OUTPUT_DIR "${CMAKE_BINARY_DIR}/minizip_OUTPUT") set(APPLICATION_OUTPUT_DIR "${CMAKE_BINARY_DIR}/OUTPUT") message("minizip=${MINIZIP_OUTPUT_DIR} sdk=${LINPHONE_OUTPUT_DIR}") -#list(APPEND CMAKE_PREFIX_PATH "${LINPHONE_OUTPUT_DIR};${MINIZIP_OUTPUT_DIR};${APPLICATION_OUTPUT_DIR}") set(PREFIX_PATH "${LINPHONE_OUTPUT_DIR}|${MINIZIP_OUTPUT_DIR}|${APPLICATION_OUTPUT_DIR}") # Avoid cmake warning if CMP0071 is not set. @@ -77,7 +76,6 @@ option(ENABLE_TOOLS "Enable tools of SDK" NO) option(ENABLE_STRICT "Build with strict compilator flags e.g. -Wall -Werror" NO) option(ENABLE_FFMPEG "Build mediastreamer2 with ffmpeg video support." YES) -option(ENABLE_OPUS "Build mediastreamer2 with the OPUS codec." YES) if(WIN32 OR APPLE) else() @@ -86,29 +84,36 @@ endif() option(ENABLE_RELATIVE_PREFIX "Set Internal packages relative to the binary" YES) -set(ALL_OPTIONS "-DENABLE_UPDATE_CHECK=${ENABLE_UPDATE_CHECK}") -list(APPEND ALL_OPTIONS "-DENABLE_APP_PACKAGING=${ENABLE_APP_PACKAGING}") -list(APPEND ALL_OPTIONS "-DENABLE_UNIT_TESTS=${ENABLE_UNIT_TESTS}") -list(APPEND ALL_OPTIONS "-DENABLE_TESTS=${ENABLE_TESTS}") -list(APPEND ALL_OPTIONS "-DENABLE_TESTS_COMPONENTS=${ENABLE_TESTS_COMPONENTS}") -list(APPEND ALL_OPTIONS "-DENABLE_TOOLS=${ENABLE_TOOLS}") -list(APPEND ALL_OPTIONS "-DENABLE_STRICT=${ENABLE_STRICT}") -list(APPEND ALL_OPTIONS "-DENABLE_FFMPEG=${ENABLE_FFMPEG}") -list(APPEND ALL_OPTIONS "-DENABLE_OPUS=${ENABLE_OPUS}") +set(APP_OPTIONS "-DENABLE_UPDATE_CHECK=${ENABLE_UPDATE_CHECK}") +list(APPEND APP_OPTIONS "-DENABLE_APP_PACKAGING=${ENABLE_APP_PACKAGING}") +list(APPEND APP_OPTIONS "-DENABLE_UNIT_TESTS=${ENABLE_UNIT_TESTS}") +list(APPEND APP_OPTIONS "-DENABLE_TESTS=${ENABLE_TESTS}") +list(APPEND APP_OPTIONS "-DENABLE_TESTS_COMPONENTS=${ENABLE_TESTS_COMPONENTS}") +list(APPEND APP_OPTIONS "-DENABLE_TOOLS=${ENABLE_TOOLS}") +list(APPEND APP_OPTIONS "-DENABLE_STRICT=${ENABLE_STRICT}") +list(APPEND APP_OPTIONS "-DENABLE_FFMPEG=${ENABLE_FFMPEG}") +list(APPEND APP_OPTIONS "-DENABLE_OPUS=${ENABLE_OPUS}") if(ENABLE_V4L) - list(APPEND ALL_OPTIONS "-DENABLE_V4L=${ENABLE_V4L}") + list(APPEND APP_OPTIONS "-DENABLE_V4L=${ENABLE_V4L}") endif() -list(APPEND ALL_OPTIONS "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}") -list(APPEND ALL_OPTIONS "-DLINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}") +list(APPEND APP_OPTIONS "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}") +list(APPEND APP_OPTIONS "-DLINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}") include(ExternalProject) -if(${CMAKE_VERSION} VERSION_LESS "3.12.0") - set(PROJECT_BUILD_COMMAND "") -else() - list(APPEND PROJECT_BUILD_COMMAND "--parallel" "10") +#Get all CMAKE_* variables to pass them to external projects +include(linphone-sdk/cmake/LinphoneSdkUtils.cmake) +linphone_sdk_get_inherited_cmake_args() +list(APPEND APP_OPTIONS ${_inherited_cmake_args}) +set(PROJECT_BUILD_COMMAND "") +if(CMAKE_BUILD_PARALLEL_LEVEL) + list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}") #add it because it was not added by the SDK + if(${CMAKE_VERSION} VERSION_LESS "3.12.0") #CMAKE_BUILD_PARALLEL_LEVEL will not always work for External projects + list(APPEND PROJECT_BUILD_COMMAND "--parallel" "${CMAKE_BUILD_PARALLEL_LEVEL}") + endif() endif() + ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk" SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-sdk" INSTALL_DIR "${LINPHONE_OUTPUT_DIR}" @@ -118,7 +123,7 @@ ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk" BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} INSTALL_COMMAND cmake -E echo "Skipping install step." LIST_SEPARATOR | # Use the alternate list separator - CMAKE_ARGS ${ALL_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} ${USER_ARGS} + CMAKE_ARGS ${APP_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} ${USER_ARGS} #BUILD_ALWAYS NO #${DO_BUILD} ) ExternalProject_Add_Step(sdk force_build @@ -134,7 +139,7 @@ ExternalProject_Add(minizip PREFIX "${CMAKE_BINARY_DIR}/minizip" DEPENDS sdk BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} LIST_SEPARATOR | # Use the alternate list separator - CMAKE_ARGS ${ALL_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} ${USER_ARGS} + CMAKE_ARGS ${APP_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} ${USER_ARGS} ) ExternalProject_Add(linphone-qt PREFIX "${CMAKE_BINARY_DIR}/linphoneqt" SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-desktop" @@ -142,7 +147,7 @@ ExternalProject_Add(linphone-qt PREFIX "${CMAKE_BINARY_DIR}/linphoneqt" DEPENDS minizip sdk BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} LIST_SEPARATOR | # Use the alternate list separator - CMAKE_ARGS ${ALL_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} ${USER_ARGS} + CMAKE_ARGS ${APP_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} ${USER_ARGS} BUILD_ALWAYS ON ) ExternalProject_Add(linphone-qt-only PREFIX "${CMAKE_BINARY_DIR}/linphoneqt" @@ -150,6 +155,6 @@ ExternalProject_Add(linphone-qt-only PREFIX "${CMAKE_BINARY_DIR}/linphoneqt" INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} LIST_SEPARATOR | # Use the alternate list separator - CMAKE_ARGS ${ALL_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} ${USER_ARGS} + CMAKE_ARGS ${APP_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} ${USER_ARGS} EXCLUDE_FROM_ALL ON ) From 24da1beab640cc1aba8ad15d4b8e332dc48e7a0a Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Wed, 25 Mar 2020 10:16:34 +0100 Subject: [PATCH 07/20] Update Readme --- CMakeLists.txt | 3 +-- README.md | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b437bae29..e63685b61 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,8 +96,7 @@ list(APPEND APP_OPTIONS "-DENABLE_OPUS=${ENABLE_OPUS}") if(ENABLE_V4L) list(APPEND APP_OPTIONS "-DENABLE_V4L=${ENABLE_V4L}") endif() - -list(APPEND APP_OPTIONS "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}") + list(APPEND APP_OPTIONS "-DLINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}") include(ExternalProject) diff --git a/README.md b/README.md index f6a27d55f..c574127ca 100644 --- a/README.md +++ b/README.md @@ -66,9 +66,9 @@ The build is done by building the SDK, the submodule Minizip and the application 1. Create your build folder at the root of the project : `mkdir build-desktop` Go to this new folder and begin the build process : `cd build-desktop` -2. Prepare your options : `cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo`. By default, it will try compile all needed dependencies. You can remove some by adding `-DENABLE_=NO` to the command. You can use `cmake-gui ..` if you want to have a better access to them. +2. Prepare your options : `cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo`. By default, it will try compile all needed dependencies. You can remove some by adding `-DENABLE_=NO` to the command. You can use `cmake-gui ..` if you want to have a better access to them. You can add `-DCMAKE_BUILD_PARALLEL_LEVEL=10` to do 10 parallel builds for speeding up the process. If it doesn't seem to work then it will be better to use CMake >= 3.12 -3. Build and install the whole project : `cmake --build . --target install --config RelWithDebInfo`. You can add `--parallel 10` to 10 parallel builds for speeding up the process if you have CMake>3.12. +3. Build and install the whole project : `cmake --build . --target all` or `cmake --build . --target ALL_BUILD` on Windows. It is important to set the config in the process or you can have a bad configuration for your binary that could lead to some corruption : on Windows, this issue is spotted when trying to start the application and an empty file with a random name is created. So, if you are working on an IDE (like Qt Creator), you may override the build command. @@ -76,7 +76,7 @@ When all are over, the files will be in the OUTPUT folder in the build directory 4. When doing some modifications in the SDK, you can rebuild only the sdk with the target `sdk` -5. For doing a package for specific platform, you can use `package` as target. This is only supported yet for Mac and Windows. +5. In order to get packages, you can use `cmake .. -DENABLE_APP_PACKAGING=YES`. The files will be in `OUTPUT/packages` folder. #### General Troubleshooting From fd69a73330a4fa8d17d52cfcafe1e64de26d061a Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Wed, 25 Mar 2020 10:22:25 +0100 Subject: [PATCH 08/20] Fix version comparaison --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e63685b61..656ec6276 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,7 +107,7 @@ list(APPEND APP_OPTIONS ${_inherited_cmake_args}) set(PROJECT_BUILD_COMMAND "") if(CMAKE_BUILD_PARALLEL_LEVEL) list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}") #add it because it was not added by the SDK - if(${CMAKE_VERSION} VERSION_LESS "3.12.0") #CMAKE_BUILD_PARALLEL_LEVEL will not always work for External projects + if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12.0") #CMAKE_BUILD_PARALLEL_LEVEL will not always work for External projects list(APPEND PROJECT_BUILD_COMMAND "--parallel" "${CMAKE_BUILD_PARALLEL_LEVEL}") endif() endif() From 6dce85c4873fd4c6a4e57f257d8e822e43f80820 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Wed, 25 Mar 2020 10:28:25 +0100 Subject: [PATCH 09/20] Remove option --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 656ec6276..3ca77012d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,7 +92,6 @@ list(APPEND APP_OPTIONS "-DENABLE_TESTS_COMPONENTS=${ENABLE_TESTS_COMPONENTS}") list(APPEND APP_OPTIONS "-DENABLE_TOOLS=${ENABLE_TOOLS}") list(APPEND APP_OPTIONS "-DENABLE_STRICT=${ENABLE_STRICT}") list(APPEND APP_OPTIONS "-DENABLE_FFMPEG=${ENABLE_FFMPEG}") -list(APPEND APP_OPTIONS "-DENABLE_OPUS=${ENABLE_OPUS}") if(ENABLE_V4L) list(APPEND APP_OPTIONS "-DENABLE_V4L=${ENABLE_V4L}") endif() From a0f667501e5bd4488264692ef65af9ce1d38d61c Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Wed, 25 Mar 2020 11:02:16 +0100 Subject: [PATCH 10/20] Remove inherited cmake variables --- CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ca77012d..e2071843a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,13 +99,9 @@ endif() list(APPEND APP_OPTIONS "-DLINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}") include(ExternalProject) -#Get all CMAKE_* variables to pass them to external projects -include(linphone-sdk/cmake/LinphoneSdkUtils.cmake) -linphone_sdk_get_inherited_cmake_args() -list(APPEND APP_OPTIONS ${_inherited_cmake_args}) set(PROJECT_BUILD_COMMAND "") if(CMAKE_BUILD_PARALLEL_LEVEL) - list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}") #add it because it was not added by the SDK + list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}") if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12.0") #CMAKE_BUILD_PARALLEL_LEVEL will not always work for External projects list(APPEND PROJECT_BUILD_COMMAND "--parallel" "${CMAKE_BUILD_PARALLEL_LEVEL}") endif() From 3e7452af299fc53546502ed94c62179adea8a939 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Wed, 25 Mar 2020 22:34:39 +0100 Subject: [PATCH 11/20] MAcOs fix : PREFIX_PATH order and add custom paths to it, fix minizip path for install_name_tool Revert moving tools folder for hooks --- CMakeLists.txt | 22 ++++++++++++------- linphone-desktop/CMakeLists.txt | 9 ++++---- .../tools => tools}/build_qt_rpm | 0 .../tools => tools}/check_qml_syntax | 0 .../tools => tools}/private/pre-commit | 0 {linphone-desktop/tools => tools}/test_qml | 0 .../tools => tools}/update_resources | 0 7 files changed, 19 insertions(+), 12 deletions(-) rename {linphone-desktop/tools => tools}/build_qt_rpm (100%) rename {linphone-desktop/tools => tools}/check_qml_syntax (100%) rename {linphone-desktop/tools => tools}/private/pre-commit (100%) rename {linphone-desktop/tools => tools}/test_qml (100%) rename {linphone-desktop/tools => tools}/update_resources (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index e2071843a..b79a0a55a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,8 +26,11 @@ get_cmake_property(vars CACHE_VARIABLES) foreach(var ${vars}) get_property(currentHelpString CACHE "${var}" PROPERTY HELPSTRING) if("${currentHelpString}" MATCHES "No help, variable specified on the command line." OR "${currentHelpString}" STREQUAL "") - # message("${var} = [${${var}}] -- ${currentHelpString}") # uncomment to see the variables being processed + #message("${var} = [${${var}}] -- ${currentHelpString}") # uncomment to see the variables being processed list(APPEND USER_ARGS "-D${var}=${${var}}") + if( "${var}" STREQUAL "CMAKE_PREFIX_PATH") + set(PREFIX_PATH "|${${var}}") + endif() endif() endforeach() @@ -43,7 +46,8 @@ set(MINIZIP_BUILD_DIR "${CMAKE_BINARY_DIR}/minizip_BUILD") set(MINIZIP_OUTPUT_DIR "${CMAKE_BINARY_DIR}/minizip_OUTPUT") set(APPLICATION_OUTPUT_DIR "${CMAKE_BINARY_DIR}/OUTPUT") message("minizip=${MINIZIP_OUTPUT_DIR} sdk=${LINPHONE_OUTPUT_DIR}") -set(PREFIX_PATH "${LINPHONE_OUTPUT_DIR}|${MINIZIP_OUTPUT_DIR}|${APPLICATION_OUTPUT_DIR}") + +set(PREFIX_PATH "${LINPHONE_OUTPUT_DIR}|${MINIZIP_OUTPUT_DIR}|${APPLICATION_OUTPUT_DIR}${PREFIX_PATH}") # Avoid cmake warning if CMP0071 is not set. if (POLICY CMP0071) @@ -95,18 +99,19 @@ list(APPEND APP_OPTIONS "-DENABLE_FFMPEG=${ENABLE_FFMPEG}") if(ENABLE_V4L) list(APPEND APP_OPTIONS "-DENABLE_V4L=${ENABLE_V4L}") endif() +list(APPEND APP_OPTIONS "-DENABLE_RELATIVE_PREFIX=${ENABLE_RELATIVE_PREFIX}") list(APPEND APP_OPTIONS "-DLINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}") include(ExternalProject) -set(PROJECT_BUILD_COMMAND "") +set(PROJECT_BUILD_COMMAND "--verbose") if(CMAKE_BUILD_PARALLEL_LEVEL) list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}") if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12.0") #CMAKE_BUILD_PARALLEL_LEVEL will not always work for External projects list(APPEND PROJECT_BUILD_COMMAND "--parallel" "${CMAKE_BUILD_PARALLEL_LEVEL}") endif() endif() - +message("User Args : ${USER_ARGS}") ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk" SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-sdk" @@ -117,7 +122,7 @@ ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk" BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} INSTALL_COMMAND cmake -E echo "Skipping install step." LIST_SEPARATOR | # Use the alternate list separator - CMAKE_ARGS ${APP_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} ${USER_ARGS} + CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} #BUILD_ALWAYS NO #${DO_BUILD} ) ExternalProject_Add_Step(sdk force_build @@ -133,7 +138,7 @@ ExternalProject_Add(minizip PREFIX "${CMAKE_BINARY_DIR}/minizip" DEPENDS sdk BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} LIST_SEPARATOR | # Use the alternate list separator - CMAKE_ARGS ${APP_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} ${USER_ARGS} + CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} ) ExternalProject_Add(linphone-qt PREFIX "${CMAKE_BINARY_DIR}/linphoneqt" SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-desktop" @@ -141,7 +146,8 @@ ExternalProject_Add(linphone-qt PREFIX "${CMAKE_BINARY_DIR}/linphoneqt" DEPENDS minizip sdk BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} LIST_SEPARATOR | # Use the alternate list separator - CMAKE_ARGS ${APP_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} ${USER_ARGS} + CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} + # ${APP_OPTIONS} BUILD_ALWAYS ON ) ExternalProject_Add(linphone-qt-only PREFIX "${CMAKE_BINARY_DIR}/linphoneqt" @@ -149,6 +155,6 @@ ExternalProject_Add(linphone-qt-only PREFIX "${CMAKE_BINARY_DIR}/linphoneqt" INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} LIST_SEPARATOR | # Use the alternate list separator - CMAKE_ARGS ${APP_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} ${USER_ARGS} + CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} EXCLUDE_FROM_ALL ON ) diff --git a/linphone-desktop/CMakeLists.txt b/linphone-desktop/CMakeLists.txt index 069c2ec28..709b1f974 100644 --- a/linphone-desktop/CMakeLists.txt +++ b/linphone-desktop/CMakeLists.txt @@ -22,8 +22,8 @@ cmake_minimum_required(VERSION 3.1) project(linphoneqt VERSION 4.1.1) -message("CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}") -message("Options : ${ENABLE_PACKAGING}, ${ENABLE_UPDATE_CHECK}, ${ENABLE_UNIT_TESTS}, ${ENABLE_TESTS}, ${ENABLE_TESTS_COMPONENTS}, ${ENABLE_TOOLS}, ${ENABLE_STRICT}, ${ENABLE_FFMPEG}, ${ENABLE_OPUS}") +#message("CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}") +message("Options : ${ENABLE_UPDATE_CHECK}, ${ENABLE_UNIT_TESTS}, ${ENABLE_TESTS}, ${ENABLE_TESTS_COMPONENTS}, ${ENABLE_TOOLS}, ${ENABLE_STRICT}, ${ENABLE_FFMPEG}, ${ENABLE_OPUS}") include(GNUInstallDirs) include(CheckCXXCompilerFlag) @@ -72,7 +72,8 @@ message("LINPHONECXX : ${LINPHONECXX_INCLUDE_DIRS} => ${LINPHONECXX_LIBRARIES}") # Build configuration set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG -DQT_NO_DEBUG") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DQT_QML_DEBUG -DQT_DECLARATIVE_DEBUG") -set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG -DQT_QML_DEBUG -DQT_DECLARATIVE_DEBUG") +set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG -DQT_QML_DEBUG -DQT_DECLARATIVE_DEBUG" ) + if( WIN32) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WINSOCKAPI_")#remove error from windows headers order endif() @@ -503,7 +504,7 @@ source_group( # ------------------------------ if(APPLE) target_link_libraries(${TARGET_NAME} "${MINIZIP_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libminizip.dylib") - execute_process(COMMAND install_name_tool -id "@executable_path/Frameworks/libminizip.dylib" "${MINIZIP_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libminizip.dylib") + execute_process(COMMAND install_name_tool -id "@executable_path/../Frameworks/libminizip.dylib" "${MINIZIP_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libminizip.dylib") elseif(NOT WIN32) # target_link_libraries(${TARGET_NAME} "${MINIZIP_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/libminizip.so") endif() diff --git a/linphone-desktop/tools/build_qt_rpm b/tools/build_qt_rpm similarity index 100% rename from linphone-desktop/tools/build_qt_rpm rename to tools/build_qt_rpm diff --git a/linphone-desktop/tools/check_qml_syntax b/tools/check_qml_syntax similarity index 100% rename from linphone-desktop/tools/check_qml_syntax rename to tools/check_qml_syntax diff --git a/linphone-desktop/tools/private/pre-commit b/tools/private/pre-commit similarity index 100% rename from linphone-desktop/tools/private/pre-commit rename to tools/private/pre-commit diff --git a/linphone-desktop/tools/test_qml b/tools/test_qml similarity index 100% rename from linphone-desktop/tools/test_qml rename to tools/test_qml diff --git a/linphone-desktop/tools/update_resources b/tools/update_resources similarity index 100% rename from linphone-desktop/tools/update_resources rename to tools/update_resources From 1c9e546f5d561a9cebea976b81ba5952b13973cc Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Wed, 25 Mar 2020 23:24:37 +0100 Subject: [PATCH 12/20] Remove forgotten debug command --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b79a0a55a..e87531f7c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,7 +104,7 @@ list(APPEND APP_OPTIONS "-DENABLE_RELATIVE_PREFIX=${ENABLE_RELATIVE_PREFIX}") list(APPEND APP_OPTIONS "-DLINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}") include(ExternalProject) -set(PROJECT_BUILD_COMMAND "--verbose") +set(PROJECT_BUILD_COMMAND "") if(CMAKE_BUILD_PARALLEL_LEVEL) list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}") if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12.0") #CMAKE_BUILD_PARALLEL_LEVEL will not always work for External projects From 0c476e1ec7f42242b09536e88b38f87ef4d184d1 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Thu, 26 Mar 2020 11:37:26 +0100 Subject: [PATCH 13/20] Use External projects to prepare projects, use macdeploy only for packaging, reoder App instanciation --- CMakeLists.txt | 53 +++++++++++++------ linphone-desktop/CMakeLists.txt | 9 ++-- .../linphone_package/CMakeLists.txt | 5 +- linphone-desktop/src/app/AppController.cpp | 5 +- 4 files changed, 47 insertions(+), 25 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b79a0a55a..307881044 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ foreach(var ${vars}) #message("${var} = [${${var}}] -- ${currentHelpString}") # uncomment to see the variables being processed list(APPEND USER_ARGS "-D${var}=${${var}}") if( "${var}" STREQUAL "CMAKE_PREFIX_PATH") - set(PREFIX_PATH "|${${var}}") + set(PREFIX_PATH ";${${var}}") endif() endif() endforeach() @@ -47,7 +47,9 @@ set(MINIZIP_OUTPUT_DIR "${CMAKE_BINARY_DIR}/minizip_OUTPUT") set(APPLICATION_OUTPUT_DIR "${CMAKE_BINARY_DIR}/OUTPUT") message("minizip=${MINIZIP_OUTPUT_DIR} sdk=${LINPHONE_OUTPUT_DIR}") -set(PREFIX_PATH "${LINPHONE_OUTPUT_DIR}|${MINIZIP_OUTPUT_DIR}|${APPLICATION_OUTPUT_DIR}${PREFIX_PATH}") +set(CMAKE_PREFIX_PATH "${LINPHONE_OUTPUT_DIR};${MINIZIP_OUTPUT_DIR};${APPLICATION_OUTPUT_DIR}${PREFIX_PATH}") +string(REPLACE ";" "|" PREFIX_PATH "${CMAKE_PREFIX_PATH}") +#set(PREFIX_PATH "${LINPHONE_OUTPUT_DIR}|${MINIZIP_OUTPUT_DIR}|${APPLICATION_OUTPUT_DIR}${PREFIX_PATH}") # Avoid cmake warning if CMP0071 is not set. if (POLICY CMP0071) @@ -104,7 +106,7 @@ list(APPEND APP_OPTIONS "-DENABLE_RELATIVE_PREFIX=${ENABLE_RELATIVE_PREFIX}") list(APPEND APP_OPTIONS "-DLINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}") include(ExternalProject) -set(PROJECT_BUILD_COMMAND "--verbose") +set(PROJECT_BUILD_COMMAND "") if(CMAKE_BUILD_PARALLEL_LEVEL) list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}") if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12.0") #CMAKE_BUILD_PARALLEL_LEVEL will not always work for External projects @@ -131,7 +133,8 @@ ExternalProject_Add_Step(sdk force_build DEPENDERS build ALWAYS 1 ) -ExternalProject_Add(minizip PREFIX "${CMAKE_BINARY_DIR}/minizip" +#Don't use minizip as target name because it can be a conflict with link libraries names +ExternalProject_Add(miniziplib PREFIX "${CMAKE_BINARY_DIR}/minizip" SOURCE_DIR "${CMAKE_SOURCE_DIR}/submodules/externals/minizip" INSTALL_DIR "${MINIZIP_OUTPUT_DIR}" BUILD_ALWAYS ON @@ -140,17 +143,37 @@ ExternalProject_Add(minizip PREFIX "${CMAKE_BINARY_DIR}/minizip" LIST_SEPARATOR | # Use the alternate list separator CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} ) -ExternalProject_Add(linphone-qt PREFIX "${CMAKE_BINARY_DIR}/linphoneqt" - SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-desktop" - INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" - DEPENDS minizip sdk - BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} - LIST_SEPARATOR | # Use the alternate list separator - CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} - # ${APP_OPTIONS} - BUILD_ALWAYS ON -) -ExternalProject_Add(linphone-qt-only PREFIX "${CMAKE_BINARY_DIR}/linphoneqt" +include(FindPkgConfig) +find_package(LinphoneCxx CONFIG) +find_package(Linphone CONFIG) +find_package(bctoolbox CONFIG) +find_package(belcard CONFIG) +find_package(Mediastreamer2 CONFIG) +find_package(ortp CONFIG) +pkg_search_module(MINIZIP minizip) + +if(NOT (LinphoneCxx_FOUND) OR NOT (Linphone_FOUND) OR NOT (bctoolbox_FOUND) OR NOT (belcard_FOUND) OR NOT (Mediastreamer2_FOUND) OR NOT (ortp_FOUND) OR NOT(MINIZIP_FOUND) ) + message("Projects are set as External projects. You can start building them by using for example : cmake --build . --target all") + ExternalProject_Add(linphone-qt PREFIX "${CMAKE_BINARY_DIR}/linphoneqt" + SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-desktop" + INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" + DEPENDS miniziplib sdk + BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} + LIST_SEPARATOR | # Use the alternate list separator + CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} + # ${APP_OPTIONS} + BUILD_ALWAYS ON + ) + set(AUTO_REGENERATION auto_regeneration) + add_custom_target(${AUTO_REGENERATION} ALL + COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDS linphone-qt) +else() + message("Adding Linphone Desktop in an IDE-friendly state") + set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}") + add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-desktop) +endif() +ExternalProject_Add(linphoneqt-only PREFIX "${CMAKE_BINARY_DIR}/linphoneqt" SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-desktop" INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} diff --git a/linphone-desktop/CMakeLists.txt b/linphone-desktop/CMakeLists.txt index 709b1f974..0c9ab9817 100644 --- a/linphone-desktop/CMakeLists.txt +++ b/linphone-desktop/CMakeLists.txt @@ -62,7 +62,6 @@ find_package(ortp CONFIG) include(FindPkgConfig) pkg_search_module(MINIZIP minizip) set(MINIZIP_INCLUDE_DIRS "${MINIZIP_PREFIX}/${MINIZIP_INCLUDE_DIRS}") -#set(MINIZIP_LIBRARIES "${MINIZIP_PREFIX}/${MINIZIP_LIBRARIES}") message("MINIZIP : ${MINIZIP_INCLUDE_DIRS} => ${MINIZIP_LIBRARIES}") message("INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} FRAMEWORK_PATH=${CMAKE_FRAMEWORK_PATH}") @@ -296,12 +295,12 @@ endforeach () if (NOT WIN32) add_custom_target( check_qml DEPENDS ${QML_SOURCES} - COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/tools/check_qml_syntax" + COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/../tools/check_qml_syntax" ) endif() execute_process(COMMAND ${CMAKE_COMMAND} -E copy - "${CMAKE_CURRENT_SOURCE_DIR}/tools/private/pre-commit" + "${CMAKE_CURRENT_SOURCE_DIR}/../tools/private/pre-commit" "${CMAKE_CURRENT_SOURCE_DIR}/../.git/hooks/pre-commit" ) set(_QML_IMPORT_PATHS "") @@ -396,8 +395,8 @@ set_target_properties(${TARGET_NAME} PROPERTIES OUTPUT_NAME "${EXECUTABLE_NAME}" set(INCLUDED_DIRECTORIES "${LINPHONECXX_INCLUDE_DIRS}" "${MINIZIP_INCLUDE_DIRS}") -#set(LIBRARIES ${BCTOOLBOX_CORE_LIBRARIES} ${BELCARD_LIBRARIES} ${LINPHONE_LIBRARIES} ${LINPHONECXX_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES} ${ORTP_LIBRARIES} ${OPUS_LIBRARIES} ${MINIZIP_LIBRARIES}) -set(LIBRARIES ${BCTOOLBOX_CORE_LIBRARIES} ${BELCARD_LIBRARIES} ${LINPHONE_LIBRARIES} ${LINPHONECXX_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES} ${ORTP_LIBRARIES} ${OPUS_LIBRARIES} "minizip") +set(LIBRARIES ${BCTOOLBOX_CORE_LIBRARIES} ${BELCARD_LIBRARIES} ${LINPHONE_LIBRARIES} ${LINPHONECXX_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES} ${ORTP_LIBRARIES} ${OPUS_LIBRARIES} ${MINIZIP_LIBRARIES}) +#set(LIBRARIES ${BCTOOLBOX_CORE_LIBRARIES} ${BELCARD_LIBRARIES} ${LINPHONE_LIBRARIES} ${LINPHONECXX_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES} ${ORTP_LIBRARIES} ${OPUS_LIBRARIES} "minizip") message("LIBRARIES : ${LIBRARIES}") foreach (package ${QT5_PACKAGES}) diff --git a/linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt b/linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt index d3df8e7e3..7c05a0a03 100644 --- a/linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt +++ b/linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt @@ -175,8 +175,9 @@ elseif (APPLE) install( CODE "execute_process(COMMAND install_name_tool -add_rpath \"@executable_path/../Frameworks/\" \"\${CMAKE_INSTALL_PREFIX}/${APPLICATION_NAME}.app/Contents/MacOS/${EXECUTABLE_NAME}\")") install( CODE "execute_process(COMMAND install_name_tool -add_rpath \"@executable_path/../lib/\" \"\${CMAKE_INSTALL_PREFIX}/${APPLICATION_NAME}.app/Contents/MacOS/${EXECUTABLE_NAME}\")") - install( CODE "execute_process(COMMAND ${DEPLOYQT_PROGRAM} \${CMAKE_INSTALL_PREFIX}/${APPLICATION_NAME}.app -qmldir=${LINPHONE_QML_DIR})")# -verbose=2)" COMPONENT binary_application) - + if(ENABLE_APP_PACKAGING) + install( CODE "execute_process(COMMAND ${DEPLOYQT_PROGRAM} \${CMAKE_INSTALL_PREFIX}/${APPLICATION_NAME}.app -qmldir=${LINPHONE_QML_DIR})") + endif() if (LINPHONE_BUILDER_SIGNING_IDENTITY) file(GLOB FRAMEWORKS_NAMES "${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_NAME}.app/Contents/Frameworks/*") foreach (FRAMEWORK ${FRAMEWORKS_NAMES}) diff --git a/linphone-desktop/src/app/AppController.cpp b/linphone-desktop/src/app/AppController.cpp index 9a3473047..8ff45ec84 100644 --- a/linphone-desktop/src/app/AppController.cpp +++ b/linphone-desktop/src/app/AppController.cpp @@ -43,6 +43,7 @@ AppController::AppController (int &argc, char *argv[]) { // Disable QML cache. Avoid malformed cache. qputenv("QML_DISABLE_DISK_CACHE", "true"); + mApp = new App(argc, argv); // --------------------------------------------------------------------------- QGuiApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true); @@ -57,10 +58,8 @@ AppController::AppController (int &argc, char *argv[]) { // Do not use APPLICATION_NAME here. // The EXECUTABLE_NAME will be used in qt standard paths. It's our goal. QCoreApplication::setApplicationName(EXECUTABLE_NAME); - QCoreApplication::setApplicationVersion(LINPHONE_QT_GIT_VERSION); + QCoreApplication::setApplicationVersion(LINPHONE_QT_GIT_VERSION); QApplication::setOrganizationDomain(APPLICATION_ID); - - mApp = new App(argc, argv); QQuickStyle::setStyle("Default"); if (mApp->isSecondary()) { #ifdef Q_OS_MACOS From 90324169f6381eea71a3d606255a929aa1352fe4 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Thu, 26 Mar 2020 12:19:19 +0100 Subject: [PATCH 14/20] Remove Z dependency in minizip package configuration --- submodules/externals/minizip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/externals/minizip b/submodules/externals/minizip index bb7e71453..a86770f17 160000 --- a/submodules/externals/minizip +++ b/submodules/externals/minizip @@ -1 +1 @@ -Subproject commit bb7e714530fd2278440601285d68c738510ada91 +Subproject commit a86770f17215a189c81db7f5e1b8a8edd0841b09 From 24d77b684e6168b75036de70c5fd4e85dccf089e Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Thu, 26 Mar 2020 14:13:54 +0100 Subject: [PATCH 15/20] Add verbose option for external builds --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 307881044..0e8b0b248 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,6 +113,10 @@ if(CMAKE_BUILD_PARALLEL_LEVEL) list(APPEND PROJECT_BUILD_COMMAND "--parallel" "${CMAKE_BUILD_PARALLEL_LEVEL}") endif() endif() +if(CMAKE_VERBOSE_MAKEFILE) + list(APPEND APP_OPTIONS "-DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE}") + list(APPEND PROJECT_BUILD_COMMAND "--verbose") +endif() message("User Args : ${USER_ARGS}") ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk" From 1df06093305260662a9946b789d63b9fcc0aa9e2 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Thu, 26 Mar 2020 14:35:32 +0100 Subject: [PATCH 16/20] Add cmake version limit to use verbose command --- CMakeLists.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e8b0b248..023e88cae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,14 +108,16 @@ list(APPEND APP_OPTIONS "-DLINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}") include(ExternalProject) set(PROJECT_BUILD_COMMAND "") if(CMAKE_BUILD_PARALLEL_LEVEL) - list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}") - if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12.0") #CMAKE_BUILD_PARALLEL_LEVEL will not always work for External projects - list(APPEND PROJECT_BUILD_COMMAND "--parallel" "${CMAKE_BUILD_PARALLEL_LEVEL}") - endif() + list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}") + if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12.0") #CMAKE_BUILD_PARALLEL_LEVEL will not always work for External projects + list(APPEND PROJECT_BUILD_COMMAND "--parallel" "${CMAKE_BUILD_PARALLEL_LEVEL}") + endif() endif() if(CMAKE_VERBOSE_MAKEFILE) - list(APPEND APP_OPTIONS "-DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE}") - list(APPEND PROJECT_BUILD_COMMAND "--verbose") + list(APPEND APP_OPTIONS "-DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE}") + if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.14.0") + list(APPEND PROJECT_BUILD_COMMAND "--verbose") + endif() endif() message("User Args : ${USER_ARGS}") From 08ca4791c0ccb5dd1693a878b975fd347a8cf490 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Thu, 26 Mar 2020 16:44:31 +0100 Subject: [PATCH 17/20] Change application source folder name --- {linphone-desktop => linphone-app}/CMakeLists.txt | 0 .../application_info.cmake | 0 .../assets/app-icon.rc | 0 .../assets/assistant/create-app-sip-account.rc | 0 .../assets/assistant/use-app-sip-account.rc | 0 .../assets/assistant/use-other-sip-account.rc | 0 .../assets/fonts/NotoSans-hinted/LICENSE_OFL.txt | 0 .../assets/fonts/NotoSans-hinted/NotoSans-Bold.ttf | Bin .../fonts/NotoSans-hinted/NotoSans-BoldItalic.ttf | Bin .../fonts/NotoSans-hinted/NotoSans-Italic.ttf | Bin .../fonts/NotoSans-hinted/NotoSans-Regular.ttf | Bin .../fonts/NotoSans-hinted/NotoSansUI-Bold.ttf | Bin .../fonts/NotoSans-hinted/NotoSansUI-BoldItalic.ttf | Bin .../fonts/NotoSans-hinted/NotoSansUI-Italic.ttf | Bin .../fonts/NotoSans-hinted/NotoSansUI-Regular.ttf | Bin .../assets/fonts/NotoSans-hinted/README | 0 {linphone-desktop => linphone-app}/assets/icon.ico | Bin .../assets/icons/genicons.sh | 0 .../assets/icons/genicons_1.0.sh | 0 .../assets/icons/hicolor/128x128/apps/icon.png | Bin .../assets/icons/hicolor/16x16/apps/icon.png | Bin .../assets/icons/hicolor/22x22/apps/icon.png | Bin .../assets/icons/hicolor/24x24/apps/icon.png | Bin .../assets/icons/hicolor/256x256/apps/icon.png | Bin .../assets/icons/hicolor/32x32/apps/icon.png | Bin .../assets/icons/hicolor/64x64/apps/icon.png | Bin .../assets/images/add_disabled.svg | 0 .../assets/images/add_hovered.svg | 0 .../assets/images/add_normal.svg | 0 .../assets/images/add_pressed.svg | 0 .../assets/images/attachment_disabled.svg | 0 .../assets/images/attachment_hovered.svg | 0 .../assets/images/attachment_normal.svg | 0 .../assets/images/attachment_pressed.svg | 0 .../assets/images/auto_answer.svg | 0 .../assets/images/burger_menu_hovered.svg | 0 .../assets/images/burger_menu_light_hovered.svg | 0 .../assets/images/burger_menu_light_normal.svg | 0 .../assets/images/burger_menu_light_pressed.svg | 0 .../assets/images/burger_menu_normal.svg | 0 .../assets/images/burger_menu_pressed.svg | 0 .../assets/images/call_accept_hovered.svg | 0 .../assets/images/call_accept_normal.svg | 0 .../assets/images/call_accept_pressed.svg | 0 .../assets/images/call_chat_secure_hovered.svg | 0 .../assets/images/call_chat_secure_normal.svg | 0 .../assets/images/call_chat_secure_pressed.svg | 0 .../assets/images/call_chat_unsecure_hovered.svg | 0 .../assets/images/call_chat_unsecure_normal.svg | 0 .../assets/images/call_chat_unsecure_pressed.svg | 0 .../assets/images/call_hovered.svg | 0 .../assets/images/call_normal.svg | 0 .../assets/images/call_pressed.svg | 0 .../assets/images/call_quality_0.svg | 0 .../assets/images/call_quality_1.svg | 0 .../assets/images/call_quality_2.svg | 0 .../assets/images/call_quality_3.svg | 0 .../assets/images/call_sign_connected.svg | 0 .../assets/images/call_sign_ended.svg | 0 .../assets/images/call_sign_incoming.svg | 0 .../assets/images/call_sign_outgoing.svg | 0 .../assets/images/call_sign_paused.svg | 0 .../assets/images/camera.svg | 0 .../assets/images/camera_off_hovered.svg | 0 .../assets/images/camera_off_normal.svg | 0 .../assets/images/camera_off_pressed.svg | 0 .../assets/images/camera_off_updating.svg | 0 .../assets/images/camera_on_hovered.svg | 0 .../assets/images/camera_on_normal.svg | 0 .../assets/images/camera_on_pressed.svg | 0 .../assets/images/camera_on_updating.svg | 0 .../assets/images/cancel_hovered.svg | 0 .../assets/images/cancel_normal.svg | 0 .../assets/images/cancel_pressed.svg | 0 .../assets/images/chat_amount.svg | 0 .../assets/images/chat_count.svg | 0 .../assets/images/chat_delivered.svg | 0 .../assets/images/chat_error.svg | 0 .../assets/images/chat_hovered.svg | 0 .../assets/images/chat_is_composing_0.svg | 0 .../assets/images/chat_is_composing_1.svg | 0 .../assets/images/chat_is_composing_2.svg | 0 .../assets/images/chat_is_composing_3.svg | 0 .../assets/images/chat_normal.svg | 0 .../assets/images/chat_pressed.svg | 0 .../assets/images/chat_read.svg | 0 .../assets/images/collapse.svg | 0 .../assets/images/contact_add.svg | 0 .../assets/images/contact_add_hovered.svg | 0 .../assets/images/contact_add_normal.svg | 0 .../assets/images/contact_add_pressed.svg | 0 .../assets/images/contact_card_photo_disabled.svg | 0 .../assets/images/contact_card_photo_hovered.svg | 0 .../assets/images/contact_card_photo_normal.svg | 0 .../assets/images/contact_card_photo_pressed.svg | 0 .../assets/images/contact_edit_hovered.svg | 0 .../assets/images/contact_edit_normal.svg | 0 .../assets/images/contact_edit_pressed.svg | 0 .../assets/images/contact_normal.svg | 0 .../assets/images/contact_selected.svg | 0 .../assets/images/declined_incoming_call.svg | 0 .../assets/images/declined_outgoing_call.svg | 0 .../assets/images/delete_hovered.svg | 0 .../assets/images/delete_normal.svg | 0 .../assets/images/delete_pressed.svg | 0 .../assets/images/download.svg | 0 .../assets/images/drop_down.svg | 0 .../assets/images/edit_hovered.svg | 0 .../assets/images/edit_normal.svg | 0 .../assets/images/edit_pressed.svg | 0 .../assets/images/ended_call.svg | 0 .../assets/images/file_hovered.svg | 0 .../assets/images/file_normal.svg | 0 .../assets/images/file_pressed.svg | 0 .../assets/images/file_sign.svg | 0 .../assets/images/filter.svg | 0 .../assets/images/folder_hovered.svg | 0 .../assets/images/folder_normal.svg | 0 .../assets/images/folder_pressed.svg | 0 .../assets/images/fullscreen_hovered.svg | 0 .../assets/images/fullscreen_normal.svg | 0 .../assets/images/fullscreen_pressed.svg | 0 .../assets/images/generic_error.svg | 0 .../assets/images/generic_error_hovered.svg | 0 .../assets/images/generic_error_normal.svg | 0 .../assets/images/generic_error_pressed.svg | 0 .../assets/images/hangup_hovered.svg | 0 .../assets/images/hangup_normal.svg | 0 .../assets/images/hangup_pressed.svg | 0 .../assets/images/history.svg | 0 .../assets/images/history_hovered.svg | 0 .../assets/images/history_normal.svg | 0 .../assets/images/history_pressed.svg | 0 .../assets/images/home_account_assistant.svg | 0 .../assets/images/home_invite_friends.svg | 0 .../assets/images/home_normal.svg | 0 .../assets/images/home_selected.svg | 0 .../assets/images/home_use_linphone.svg | 0 .../assets/images/incoming_call.svg | 0 .../assets/images/led_green.svg | 0 .../assets/images/led_orange.svg | 0 .../assets/images/led_red.svg | 0 .../assets/images/led_white.svg | 0 .../assets/images/linphone_logo.svg | 0 .../assets/images/message_sign.svg | 0 .../assets/images/micro.svg | 0 .../assets/images/micro_off_hovered.svg | 0 .../assets/images/micro_off_normal.svg | 0 .../assets/images/micro_off_pressed.svg | 0 .../assets/images/micro_on_hovered.svg | 0 .../assets/images/micro_on_normal.svg | 0 .../assets/images/micro_on_pressed.svg | 0 .../assets/images/missed_incoming_call.svg | 0 .../assets/images/missed_outgoing_call.svg | 0 .../assets/images/new_call_hovered.svg | 0 .../assets/images/new_call_normal.svg | 0 .../assets/images/new_call_pressed.svg | 0 .../assets/images/new_conference_hovered.svg | 0 .../assets/images/new_conference_normal.svg | 0 .../assets/images/new_conference_pressed.svg | 0 .../assets/images/options_hovered.svg | 0 .../assets/images/options_normal.svg | 0 .../assets/images/options_pressed.svg | 0 .../assets/images/outgoing_call.svg | 0 .../assets/images/pause_off_hovered.svg | 0 .../assets/images/pause_off_normal.svg | 0 .../assets/images/pause_off_pressed.svg | 0 .../assets/images/pause_off_updating.svg | 0 .../assets/images/pause_on_hovered.svg | 0 .../assets/images/pause_on_normal.svg | 0 .../assets/images/pause_on_pressed.svg | 0 .../assets/images/pause_on_updating.svg | 0 .../assets/images/record_off.svg | 0 .../assets/images/record_on.svg | 0 .../assets/images/recording_sign.svg | 0 .../assets/images/screenshot_hovered.svg | 0 .../assets/images/screenshot_normal.svg | 0 .../assets/images/screenshot_pressed.svg | 0 .../assets/images/search.svg | 0 .../assets/images/settings_advanced_normal.svg | 0 .../assets/images/settings_advanced_selected.svg | 0 .../assets/images/settings_audio_normal.svg | 0 .../assets/images/settings_audio_selected.svg | 0 .../assets/images/settings_call_normal.svg | 0 .../assets/images/settings_call_selected.svg | 0 .../assets/images/settings_network_normal.svg | 0 .../assets/images/settings_network_selected.svg | 0 .../assets/images/settings_sip_accounts_normal.svg | 0 .../images/settings_sip_accounts_selected.svg | 0 .../assets/images/settings_video_normal.svg | 0 .../assets/images/settings_video_selected.svg | 0 .../assets/images/snapshot_sign.svg | 0 .../assets/images/speaker.svg | 0 .../assets/images/speaker_off_hovered.svg | 0 .../assets/images/speaker_off_normal.svg | 0 .../assets/images/speaker_off_pressed.svg | 0 .../assets/images/speaker_on_hovered.svg | 0 .../assets/images/speaker_on_normal.svg | 0 .../assets/images/speaker_on_pressed.svg | 0 .../assets/images/tel_keypad_hovered.svg | 0 .../assets/images/tel_keypad_normal.svg | 0 .../assets/images/tel_keypad_pressed.svg | 0 .../assets/images/timeline_history.svg | 0 .../assets/images/tooltip_arrow_bottom.svg | 0 .../assets/images/tooltip_arrow_left.svg | 0 .../assets/images/tooltip_arrow_right.svg | 0 .../assets/images/tooltip_arrow_top.svg | 0 .../assets/images/transfer_hovered.svg | 0 .../assets/images/transfer_normal.svg | 0 .../assets/images/transfer_pressed.svg | 0 .../assets/images/update_sign.svg | 0 .../assets/images/video_call_accept_hovered.svg | 0 .../assets/images/video_call_accept_normal.svg | 0 .../assets/images/video_call_accept_pressed.svg | 0 .../assets/images/video_call_hovered.svg | 0 .../assets/images/video_call_normal.svg | 0 .../assets/images/video_call_pressed.svg | 0 .../assets/images/warning.svg | 0 .../assets/languages/CMakeLists.txt | 0 .../assets/languages/ar.ts | 0 .../assets/languages/az.ts | 0 .../assets/languages/az@latin.ts | 0 .../assets/languages/cs.ts | 0 .../assets/languages/de.ts | 0 .../assets/languages/de_DE.ts | 0 .../assets/languages/el.ts | 0 .../assets/languages/en.ts | 0 .../assets/languages/es.ts | 0 .../assets/languages/es_AR.ts | 0 .../assets/languages/fi.ts | 0 .../assets/languages/fr_FR.ts | 0 .../assets/languages/he.ts | 0 .../assets/languages/hu.ts | 0 .../assets/languages/it.ts | 0 .../assets/languages/ja.ts | 0 .../assets/languages/ka.ts | 0 .../assets/languages/ko_KR.ts | 0 .../assets/languages/lt.ts | 0 .../assets/languages/mk_MK.ts | 0 .../assets/languages/nb_NO.ts | 0 .../assets/languages/nl.ts | 0 .../assets/languages/pl.ts | 0 .../assets/languages/pl_PL.ts | 0 .../assets/languages/pt_BR.ts | 0 .../assets/languages/ru.ts | 0 .../assets/languages/ru_RU.ts | 0 .../assets/languages/sr.ts | 0 .../assets/languages/sv.ts | 0 .../assets/languages/tr.ts | 0 .../assets/languages/uk.ts | 0 .../assets/languages/zh-Hant.ts | 0 .../assets/languages/zh.ts | 0 .../assets/languages/zh_CN.GB2312.ts | 0 .../assets/languages/zh_CN.ts | 0 .../assets/languages/zh_TW.ts | 0 .../assets/linphone.desktop.cmake | 0 .../assets/linphonerc-factory | 0 .../build/CMakeLists.txt | 0 .../build/rpm/linphone.spec.cmake | 0 .../build/rpm/qt5.spec | 0 .../cmake/FindMinizip.cmake | 0 .../cmake_builder/CMakeLists.txt | 0 .../cmake_builder/additional_steps.cmake | 0 .../cmake_builder/install.cmake | 0 .../cmake_builder/linphone_package/CMakeLists.txt | 0 .../linphone_package/macos/Info.plist.in | 0 .../linphone_package/macos/background_dmg.jpg | Bin .../linphone_package/macos/linphone.icns | Bin .../linphone_package/macos/linphone_dmg.scpt.in | 0 .../linphone_package/packaging.cmake.in | 0 .../linphone_package/sdk_content/antlr3c.list.in | 0 .../linphone_package/sdk_content/bctoolbox.list.in | 0 .../linphone_package/sdk_content/bcunit.list.in | 0 .../linphone_package/sdk_content/bellesip.list.in | 0 .../linphone_package/sdk_content/bv16.list.in | 0 .../linphone_package/sdk_content/bzrtp.list.in | 0 .../linphone_package/sdk_content/ffmpeg.list.in | 0 .../linphone_package/sdk_content/gsm.list.in | 0 .../linphone_package/sdk_content/linphone.list.in | 0 .../sdk_content/linphonecxx.list.in | 0 .../linphone_package/sdk_content/mbedtls.list.in | 0 .../linphone_package/sdk_content/ms2.list.in | 0 .../linphone_package/sdk_content/ms2plugins.list.in | 0 .../linphone_package/sdk_content/opus.list.in | 0 .../linphone_package/sdk_content/ortp.list.in | 0 .../linphone_package/sdk_content/polarssl.list.in | 0 .../linphone_package/sdk_content/speex.list.in | 0 .../linphone_package/sdk_content/sqlite3.list.in | 0 .../linphone_package/sdk_content/srtp.list.in | 0 .../linphone_package/sdk_content/vcard.list.in | 0 .../linphone_package/sdk_content/xml2.list.in | 0 .../linphone_package/sdk_content/zlib.list.in | 0 .../linphone_package/windows/NSIS.template.in | 0 .../linphone_package/windows/install.nsi.in | 0 .../linphone_package/windows/nsis_banner.bmp | Bin .../linphone_package/windows/signtool.py | 0 .../linphone_package/windows/uninstall.nsi.in | 0 .../linphone_package/windows/winshortcut.vbs.in | 0 .../cmake_builder/linphoneqt.cmake | 0 {linphone-desktop => linphone-app}/resources.qrc | 0 {linphone-desktop => linphone-app}/src/app/App.cpp | 0 {linphone-desktop => linphone-app}/src/app/App.hpp | 0 .../src/app/AppController.cpp | 0 .../src/app/AppController.hpp | 0 .../src/app/cli/Cli.cpp | 0 .../src/app/cli/Cli.hpp | 0 .../src/app/logger/Logger.cpp | 0 .../src/app/logger/Logger.hpp | 0 {linphone-desktop => linphone-app}/src/app/main.cpp | 0 .../src/app/paths/Paths.cpp | 0 .../src/app/paths/Paths.hpp | 0 .../src/app/providers/AvatarProvider.cpp | 0 .../src/app/providers/AvatarProvider.hpp | 0 .../src/app/providers/ImageProvider.cpp | 0 .../src/app/providers/ImageProvider.hpp | 0 .../src/app/providers/ThumbnailProvider.cpp | 0 .../src/app/providers/ThumbnailProvider.hpp | 0 .../app/single-application/SingleApplication.cpp | 0 .../app/single-application/SingleApplication.hpp | 0 .../single-application/SingleApplicationDBus.cpp | 0 .../SingleApplicationDBusPrivate.hpp | 0 .../single-application/SingleApplicationPrivate.hpp | 0 .../src/app/translator/DefaultTranslator.cpp | 0 .../src/app/translator/DefaultTranslator.hpp | 0 .../src/components/Components.hpp | 0 .../src/components/assistant/AssistantModel.cpp | 0 .../src/components/assistant/AssistantModel.hpp | 0 .../authentication/AuthenticationNotifier.cpp | 0 .../authentication/AuthenticationNotifier.hpp | 0 .../src/components/call/CallModel.cpp | 0 .../src/components/call/CallModel.hpp | 0 .../src/components/calls/CallsListModel.cpp | 0 .../src/components/calls/CallsListModel.hpp | 0 .../src/components/calls/CallsListProxyModel.cpp | 0 .../src/components/calls/CallsListProxyModel.hpp | 0 .../src/components/camera/Camera.cpp | 0 .../src/components/camera/Camera.hpp | 0 .../src/components/camera/CameraPreview.cpp | 0 .../src/components/camera/CameraPreview.hpp | 0 .../src/components/camera/MSFunctions.cpp | 0 .../src/components/camera/MSFunctions.hpp | 0 .../src/components/chat/ChatModel.cpp | 0 .../src/components/chat/ChatModel.hpp | 0 .../src/components/chat/ChatProxyModel.cpp | 0 .../src/components/chat/ChatProxyModel.hpp | 0 .../src/components/codecs/AbstractCodecsModel.cpp | 0 .../src/components/codecs/AbstractCodecsModel.hpp | 0 .../src/components/codecs/AudioCodecsModel.cpp | 0 .../src/components/codecs/AudioCodecsModel.hpp | 0 .../src/components/codecs/VideoCodecsModel.cpp | 0 .../src/components/codecs/VideoCodecsModel.hpp | 0 .../components/conference/ConferenceAddModel.cpp | 0 .../components/conference/ConferenceAddModel.hpp | 0 .../components/conference/ConferenceHelperModel.cpp | 0 .../components/conference/ConferenceHelperModel.hpp | 0 .../src/components/conference/ConferenceModel.cpp | 0 .../src/components/conference/ConferenceModel.hpp | 0 .../src/components/contact/ContactModel.cpp | 0 .../src/components/contact/ContactModel.hpp | 0 .../src/components/contact/VcardModel.cpp | 0 .../src/components/contact/VcardModel.hpp | 0 .../src/components/contacts/ContactsListModel.cpp | 0 .../src/components/contacts/ContactsListModel.hpp | 0 .../components/contacts/ContactsListProxyModel.cpp | 0 .../components/contacts/ContactsListProxyModel.hpp | 0 .../src/components/core/CoreHandlers.cpp | 0 .../src/components/core/CoreHandlers.hpp | 0 .../src/components/core/CoreManager.cpp | 0 .../src/components/core/CoreManager.hpp | 0 .../AbstractEventCountNotifier.cpp | 0 .../AbstractEventCountNotifier.hpp | 0 .../EventCountNotifierMacOs.hpp | 0 .../event-count-notifier/EventCountNotifierMacOs.m | 0 .../EventCountNotifierSystemTrayIcon.cpp | 0 .../EventCountNotifierSystemTrayIcon.hpp | 0 .../src/components/file/FileDownloader.cpp | 0 .../src/components/file/FileDownloader.hpp | 0 .../src/components/file/FileExtractor.cpp | 0 .../src/components/file/FileExtractor.hpp | 0 .../src/components/notifier/Notifier.cpp | 0 .../src/components/notifier/Notifier.hpp | 0 .../src/components/other/clipboard/Clipboard.cpp | 0 .../src/components/other/clipboard/Clipboard.hpp | 0 .../src/components/other/colors/Colors.cpp | 0 .../src/components/other/colors/Colors.hpp | 0 .../components/other/desktop-tools/DesktopTools.hpp | 0 .../other/desktop-tools/DesktopToolsLinux.cpp | 0 .../other/desktop-tools/DesktopToolsLinux.hpp | 0 .../other/desktop-tools/DesktopToolsMacOs.cpp | 0 .../other/desktop-tools/DesktopToolsMacOs.hpp | 0 .../other/desktop-tools/DesktopToolsWindows.cpp | 0 .../other/desktop-tools/DesktopToolsWindows.hpp | 0 .../desktop-tools/screen-saver/ScreenSaverDBus.cpp | 0 .../desktop-tools/screen-saver/ScreenSaverDBus.hpp | 0 .../desktop-tools/screen-saver/ScreenSaverMacOs.m | 0 .../desktop-tools/screen-saver/ScreenSaverXdg.cpp | 0 .../desktop-tools/screen-saver/ScreenSaverXdg.hpp | 0 .../state-process/StateProcessMacOs.mm | 0 .../other/text-to-speech/TextToSpeech.cpp | 0 .../other/text-to-speech/TextToSpeech.hpp | 0 .../src/components/other/units/Units.cpp | 0 .../src/components/other/units/Units.hpp | 0 .../src/components/presence/OwnPresenceModel.cpp | 0 .../src/components/presence/OwnPresenceModel.hpp | 0 .../src/components/presence/Presence.cpp | 0 .../src/components/presence/Presence.hpp | 0 .../components/settings/AccountSettingsModel.cpp | 0 .../components/settings/AccountSettingsModel.hpp | 0 .../src/components/settings/SettingsModel.cpp | 0 .../src/components/settings/SettingsModel.hpp | 0 .../components/sip-addresses/SipAddressObserver.cpp | 0 .../components/sip-addresses/SipAddressObserver.hpp | 0 .../components/sip-addresses/SipAddressesModel.cpp | 0 .../components/sip-addresses/SipAddressesModel.hpp | 0 .../sip-addresses/SipAddressesProxyModel.cpp | 0 .../sip-addresses/SipAddressesProxyModel.hpp | 0 .../src/components/sound-player/SoundPlayer.cpp | 0 .../src/components/sound-player/SoundPlayer.hpp | 0 .../telephone-numbers/TelephoneNumbersModel.cpp | 0 .../telephone-numbers/TelephoneNumbersModel.hpp | 0 .../src/components/timeline/TimelineModel.cpp | 0 .../src/components/timeline/TimelineModel.hpp | 0 .../src/components/url-handlers/UrlHandlers.cpp | 0 .../src/components/url-handlers/UrlHandlers.hpp | 0 .../src/config.h.cmake | 0 .../src/utils/LinphoneUtils.cpp | 0 .../src/utils/LinphoneUtils.hpp | 0 .../src/utils/MediastreamerUtils.cpp | 0 .../src/utils/MediastreamerUtils.hpp | 0 .../src/utils/QExifImageHeader.cpp | 0 .../src/utils/QExifImageHeader.hpp | 0 .../src/utils/Utils.cpp | 0 .../src/utils/Utils.hpp | 0 .../ui/dev-modules/Colors/Colors.qml | 0 .../ui/dev-modules/Colors/qmldir | 0 .../ui/dev-modules/Units/Units.qml | 0 .../ui/dev-modules/Units/qmldir | 0 .../ui/modules/Common/Animations/BusyIndicator.qml | 0 .../ui/modules/Common/Constants/Constants.qml | 0 .../ui/modules/Common/Dialog/ConfirmDialog.qml | 0 .../ui/modules/Common/Dialog/DialogDescription.qml | 0 .../ui/modules/Common/Dialog/DialogPlus.qml | 0 .../ui/modules/Common/Form/ActionBar.qml | 0 .../ui/modules/Common/Form/ActionButton.qml | 0 .../ui/modules/Common/Form/ActionSwitch.qml | 0 .../Common/Form/Buttons/AbstractTextButton.qml | 0 .../Common/Form/Buttons/ExclusiveButtons.qml | 0 .../Common/Form/Buttons/ExclusiveButtons.spec.qml | 0 .../Common/Form/Buttons/FileChooserButton.qml | 0 .../ui/modules/Common/Form/Buttons/SmallButton.qml | 0 .../ui/modules/Common/Form/Buttons/TextButtonA.qml | 0 .../ui/modules/Common/Form/Buttons/TextButtonB.qml | 0 .../ui/modules/Common/Form/CheckBoxText.qml | 0 .../ui/modules/Common/Form/ComboBox.js | 0 .../ui/modules/Common/Form/ComboBox.qml | 0 .../ui/modules/Common/Form/CommonItemDelegate.qml | 0 .../ui/modules/Common/Form/DroppableTextArea.qml | 0 .../ui/modules/Common/Form/Fields/HexField.qml | 0 .../ui/modules/Common/Form/Fields/NumericField.qml | 0 .../ui/modules/Common/Form/Fields/PasswordField.qml | 0 .../ui/modules/Common/Form/Fields/PortField.qml | 0 .../Common/Form/Fields/ScrollableListViewField.qml | 0 .../ui/modules/Common/Form/Fields/TextAreaField.qml | 0 .../ui/modules/Common/Form/Fields/TextField.qml | 0 .../ui/modules/Common/Form/ListForm.js | 0 .../ui/modules/Common/Form/ListForm.qml | 0 .../ui/modules/Common/Form/ListItemSelector.js | 0 .../ui/modules/Common/Form/ListItemSelector.qml | 0 .../ui/modules/Common/Form/Placements/Form.qml | 0 .../Common/Form/Placements/FormEmptyLine.qml | 0 .../ui/modules/Common/Form/Placements/FormGroup.qml | 0 .../modules/Common/Form/Placements/FormHGroup.qml | 0 .../ui/modules/Common/Form/Placements/FormLine.qml | 0 .../ui/modules/Common/Form/Placements/FormTable.qml | 0 .../Common/Form/Placements/FormTableEntry.qml | 0 .../Common/Form/Placements/FormTableLine.qml | 0 .../modules/Common/Form/Placements/FormVGroup.qml | 0 .../ui/modules/Common/Form/SearchBox.qml | 0 .../ui/modules/Common/Form/Slider.qml | 0 .../ui/modules/Common/Form/StaticListForm.qml | 0 .../ui/modules/Common/Form/Switch.qml | 0 .../ui/modules/Common/Form/Tab/TabBar.qml | 0 .../ui/modules/Common/Form/Tab/TabButton.qml | 0 .../ui/modules/Common/Form/Tab/TabContainer.qml | 0 .../ui/modules/Common/Form/TransparentTextInput.qml | 0 .../ui/modules/Common/Helpers/DragBox.qml | 0 .../ui/modules/Common/Helpers/InvertedMouseArea.qml | 0 .../Common/Helpers/InvertedMouseArea.spec.qml | 0 .../ui/modules/Common/Image/Icon.qml | 0 .../ui/modules/Common/Image/RoundedImage.qml | 0 .../ui/modules/Common/Indicators/VuMeter.qml | 0 .../ui/modules/Common/Menus/ApplicationMenu.qml | 0 .../modules/Common/Menus/ApplicationMenuEntry.qml | 0 .../ui/modules/Common/Menus/DropDownDynamicMenu.qml | 0 .../ui/modules/Common/Menus/DropDownStaticMenu.qml | 0 .../Common/Menus/DropDownStaticMenuEntry.qml | 0 .../ui/modules/Common/Menus/Menu.qml | 0 .../ui/modules/Common/Menus/MenuItem.qml | 0 .../ui/modules/Common/Misc/Borders.qml | 0 .../ui/modules/Common/Misc/ForceScrollBar.qml | 0 .../ui/modules/Common/Misc/Paned.qml | 0 .../ui/modules/Common/Popup/DesktopPopup.qml | 0 .../ui/modules/Common/Popup/Popup.qml | 0 .../ui/modules/Common/Popup/PopupShadow.qml | 0 .../Common/Styles/Animations/BusyIndicatorStyle.qml | 0 .../ui/modules/Common/Styles/Dialog/DialogStyle.qml | 0 .../modules/Common/Styles/Form/ActionBarStyle.qml | 0 .../Styles/Form/Buttons/AbstractTextButtonStyle.qml | 0 .../Styles/Form/Buttons/ExclusiveButtonsStyle.qml | 0 .../Styles/Form/Buttons/FileChooserButtonStyle.qml | 0 .../Common/Styles/Form/Buttons/SmallButtonStyle.qml | 0 .../Common/Styles/Form/Buttons/TextButtonAStyle.qml | 0 .../Common/Styles/Form/Buttons/TextButtonBStyle.qml | 0 .../Common/Styles/Form/CheckBoxTextStyle.qml | 0 .../ui/modules/Common/Styles/Form/ComboBoxStyle.qml | 0 .../Common/Styles/Form/CommonItemDelegateStyle.qml | 0 .../Common/Styles/Form/DroppableTextAreaStyle.qml | 0 .../Common/Styles/Form/Fields/NumericFieldStyle.qml | 0 .../Styles/Form/Fields/TextAreaFieldStyle.qml | 0 .../Common/Styles/Form/Fields/TextFieldStyle.qml | 0 .../ui/modules/Common/Styles/Form/ListFormStyle.qml | 0 .../Styles/Form/Placements/FormHGroupStyle.qml | 0 .../Common/Styles/Form/Placements/FormLineStyle.qml | 0 .../Common/Styles/Form/Placements/FormStyle.qml | 0 .../Styles/Form/Placements/FormTableLineStyle.qml | 0 .../Styles/Form/Placements/FormTableStyle.qml | 0 .../Styles/Form/Placements/FormVGroupStyle.qml | 0 .../modules/Common/Styles/Form/SearchBoxStyle.qml | 0 .../ui/modules/Common/Styles/Form/SliderStyle.qml | 0 .../ui/modules/Common/Styles/Form/SwitchStyle.qml | 0 .../Common/Styles/Form/Tab/TabButtonStyle.qml | 0 .../Common/Styles/Form/Tab/TabContainerStyle.qml | 0 .../Styles/Form/TransparentTextInputStyle.qml | 0 .../Common/Styles/Indicators/VuMeterStyle.qml | 0 .../Common/Styles/Menus/ApplicationMenuStyle.qml | 0 .../Common/Styles/Menus/DropDownStaticMenuStyle.qml | 0 .../modules/Common/Styles/Menus/MenuItemStyle.qml | 0 .../ui/modules/Common/Styles/Menus/MenuStyle.qml | 0 .../Common/Styles/Misc/ForceScrollBarStyle.qml | 0 .../ui/modules/Common/Styles/Misc/PanedStyle.qml | 0 .../ui/modules/Common/Styles/Popup/PopupStyle.qml | 0 .../modules/Common/Styles/Tooltip/TooltipStyle.qml | 0 .../ui/modules/Common/Styles/Window/WindowStyle.qml | 0 .../ui/modules/Common/Styles/qmldir | 0 .../ui/modules/Common/Tooltip/Tooltip.qml | 0 .../ui/modules/Common/Tooltip/TooltipArea.qml | 0 .../ui/modules/Common/View/ScrollableListView.qml | 0 .../ui/modules/Common/Window/ApplicationWindow.qml | 0 .../ui/modules/Common/Window/VirtualWindow.qml | 0 .../ui/modules/Common/Window/Window.js | 0 .../ui/modules/Common/Window/Window.qml | 0 .../ui/modules/Common/qmldir | 0 .../ui/modules/Konami/Konami.qml | 0 .../ui/modules/Konami/qmldir | 0 .../ui/modules/Linphone/Account/AccountStatus.qml | 0 .../ui/modules/Linphone/Blocks/CardBlock.qml | 0 .../ui/modules/Linphone/Blocks/RequestBlock.qml | 0 .../ui/modules/Linphone/Calls/CallControls.qml | 0 .../ui/modules/Linphone/Calls/CallStatistics.qml | 0 .../ui/modules/Linphone/Calls/Calls.js | 0 .../ui/modules/Linphone/Calls/Calls.qml | 0 .../modules/Linphone/Calls/ConferenceControls.qml | 0 .../ui/modules/Linphone/Chat/Chat.js | 0 .../ui/modules/Linphone/Chat/Chat.qml | 0 .../ui/modules/Linphone/Chat/Event.qml | 0 .../ui/modules/Linphone/Chat/FileMessage.qml | 0 .../ui/modules/Linphone/Chat/IncomingMessage.qml | 0 .../ui/modules/Linphone/Chat/Message.js | 0 .../ui/modules/Linphone/Chat/Message.qml | 0 .../ui/modules/Linphone/Chat/OutgoingMessage.qml | 0 .../ui/modules/Linphone/Codecs/CodecAttribute.qml | 0 .../ui/modules/Linphone/Codecs/CodecLegend.qml | 0 .../ui/modules/Linphone/Codecs/CodecsViewer.qml | 0 .../ui/modules/Linphone/Contact/Avatar.qml | 0 .../ui/modules/Linphone/Contact/Contact.qml | 0 .../modules/Linphone/Contact/ContactDescription.qml | 0 .../Linphone/Contact/ContactMessageCounter.qml | 0 .../Linphone/Dialog/OnlineInstallerDialog.qml | 0 .../ui/modules/Linphone/Menus/SipAddressesMenu.qml | 0 .../ui/modules/Linphone/Misc/MessageCounter.qml | 0 .../modules/Linphone/Notifications/Notification.qml | 0 .../Linphone/Notifications/Notification.spec.qml | 0 .../Linphone/Notifications/NotificationBasic.qml | 0 .../NotificationNewVersionAvailable.qml | 0 .../Notifications/NotificationReceivedCall.qml | 0 .../NotificationReceivedFileMessage.qml | 0 .../Notifications/NotificationReceivedMessage.qml | 0 .../NotificationRecordingCompleted.qml | 0 .../Notifications/NotificationSnapshotWasTaken.qml | 0 .../ui/modules/Linphone/Presence/PresenceLevel.qml | 0 .../Linphone/SmartSearchBar/SmartSearchBar.qml | 0 .../Linphone/Styles/Account/AccountStatusStyle.qml | 0 .../Linphone/Styles/Blocks/CardBlockStyle.qml | 0 .../Linphone/Styles/Blocks/RequestBlockStyle.qml | 0 .../Linphone/Styles/Calls/CallControlsStyle.qml | 0 .../Linphone/Styles/Calls/CallStatisticsStyle.qml | 0 .../ui/modules/Linphone/Styles/Calls/CallsStyle.qml | 0 .../Styles/Calls/ConferenceControlsStyle.qml | 0 .../ui/modules/Linphone/Styles/Chat/ChatStyle.qml | 0 .../Linphone/Styles/Codecs/CodecsViewerStyle.qml | 0 .../modules/Linphone/Styles/Contact/AvatarStyle.qml | 0 .../Styles/Contact/ContactDescriptionStyle.qml | 0 .../Styles/Contact/ContactMessageCounterStyle.qml | 0 .../Linphone/Styles/Contact/ContactStyle.qml | 0 .../Styles/Dialog/OnlineInstallerDialogStyle.qml | 0 .../Linphone/Styles/Menus/SipAddressesMenuStyle.qml | 0 .../Linphone/Styles/Misc/MessageCounterStyle.qml | 0 .../Styles/Notifications/NotificationBasicStyle.qml | 0 .../Notifications/NotificationReceivedCallStyle.qml | 0 .../NotificationReceivedFileMessageStyle.qml | 0 .../NotificationReceivedMessageStyle.qml | 0 .../Styles/Notifications/NotificationStyle.qml | 0 .../Linphone/Styles/TelKeypad/TelKeypadStyle.qml | 0 .../Linphone/Styles/Timeline/TimelineStyle.qml | 0 .../Linphone/Styles/View/SipAddressesViewStyle.qml | 0 .../ui/modules/Linphone/Styles/qmldir | 0 .../ui/modules/Linphone/TelKeypad/TelKeypad.js | 0 .../ui/modules/Linphone/TelKeypad/TelKeypad.qml | 0 .../modules/Linphone/TelKeypad/TelKeypadButton.qml | 0 .../ui/modules/Linphone/Timeline/Timeline.js | 0 .../ui/modules/Linphone/Timeline/Timeline.qml | 0 .../ui/modules/Linphone/View/SipAddressesView.qml | 0 .../ui/modules/Linphone/qmldir | 0 .../ui/scripts/LinphoneUtils/linphone-utils.js | 0 .../ui/scripts/LinphoneUtils/qmldir | 0 .../ui/scripts/Utils/port-tools.js | 0 .../ui/scripts/Utils/qmldir | 0 .../ui/scripts/Utils/uri-tools.js | 0 .../ui/scripts/Utils/uri-tools.spec.qml | 0 .../ui/scripts/Utils/utils.js | 0 .../ui/scripts/Utils/utils.spec.qml | 0 .../ui/views/App/Calls/AbstractStartingCall.qml | 0 .../ui/views/App/Calls/CallsWindow.js | 0 .../ui/views/App/Calls/CallsWindow.qml | 0 .../ui/views/App/Calls/Conference.qml | 0 .../ui/views/App/Calls/Dialogs/CallSipAddress.qml | 0 .../ui/views/App/Calls/Dialogs/CallTransfer.qml | 0 .../views/App/Calls/Dialogs/ConferenceManager.qml | 0 .../App/Calls/Dialogs/MultimediaParameters.qml | 0 .../ui/views/App/Calls/EndedCall.qml | 0 .../ui/views/App/Calls/Incall.js | 0 .../ui/views/App/Calls/Incall.qml | 0 .../ui/views/App/Calls/IncallAvatar.qml | 0 .../ui/views/App/Calls/IncallFullscreenWindow.qml | 0 .../ui/views/App/Calls/IncomingCall.qml | 0 .../ui/views/App/Calls/OutgoingCall.qml | 0 .../ui/views/App/Calls/ZrtpTokenAuthentication.qml | 0 .../ui/views/App/Main/Assistant.qml | 0 .../Assistant/ActivateAppSipAccountWithEmail.qml | 0 .../ActivateAppSipAccountWithPhoneNumber.qml | 0 .../App/Main/Assistant/AssistantAbstractView.qml | 0 .../ui/views/App/Main/Assistant/AssistantHome.qml | 0 .../App/Main/Assistant/CreateAppSipAccount.qml | 0 .../Main/Assistant/CreateAppSipAccountWithEmail.qml | 0 .../CreateAppSipAccountWithPhoneNumber.qml | 0 .../App/Main/Assistant/FetchRemoteConfiguration.qml | 0 .../views/App/Main/Assistant/UseAppSipAccount.qml | 0 .../Assistant/UseAppSipAccountWithPhoneNumber.qml | 0 .../Main/Assistant/UseAppSipAccountWithUsername.qml | 0 .../views/App/Main/Assistant/UseOtherSipAccount.qml | 0 .../ui/views/App/Main/ContactEdit.js | 0 .../ui/views/App/Main/ContactEdit.qml | 0 .../ui/views/App/Main/Contacts.qml | 0 .../ui/views/App/Main/Conversation.js | 0 .../ui/views/App/Main/Conversation.qml | 0 .../ui/views/App/Main/Dialogs/About.qml | 0 .../views/App/Main/Dialogs/AuthenticationRequest.js | 0 .../App/Main/Dialogs/AuthenticationRequest.qml | 0 .../ui/views/App/Main/Dialogs/ManageAccount.js | 0 .../ui/views/App/Main/Dialogs/ManageAccounts.qml | 0 .../ui/views/App/Main/Home.qml | 0 .../ui/views/App/Main/InviteFriends.qml | 0 .../ui/views/App/Main/MainWindow.js | 0 .../ui/views/App/Main/MainWindow.qml | 0 .../ui/views/App/Main/MainWindowMenuBar.qml | 0 .../ui/views/App/Main/MainWindowTopMenuBar.qml | 0 .../App/Settings/Dialogs/SettingsSipAccountsEdit.js | 0 .../Settings/Dialogs/SettingsSipAccountsEdit.qml | 0 .../App/Settings/Dialogs/SettingsVideoPreview.qml | 0 .../ui/views/App/Settings/SettingsAdvanced.js | 0 .../ui/views/App/Settings/SettingsAdvanced.qml | 0 .../ui/views/App/Settings/SettingsAudio.qml | 0 .../ui/views/App/Settings/SettingsCallsChat.qml | 0 .../ui/views/App/Settings/SettingsNetwork.qml | 0 .../ui/views/App/Settings/SettingsSipAccounts.js | 0 .../ui/views/App/Settings/SettingsSipAccounts.qml | 0 .../ui/views/App/Settings/SettingsUi.js | 0 .../ui/views/App/Settings/SettingsUi.qml | 0 .../ui/views/App/Settings/SettingsVideo.js | 0 .../ui/views/App/Settings/SettingsVideo.qml | 0 .../ui/views/App/Settings/SettingsWindow.qml | 0 .../ui/views/App/Styles/Calls/CallStyle.qml | 0 .../ui/views/App/Styles/Calls/CallsWindowStyle.qml | 0 .../ui/views/App/Styles/Calls/ConferenceStyle.qml | 0 .../Styles/Calls/Dialogs/CallSipAddressStyle.qml | 0 .../App/Styles/Calls/Dialogs/CallTransferStyle.qml | 0 .../Styles/Calls/Dialogs/ConferenceManagerStyle.qml | 0 .../Calls/Dialogs/MultimediaParametersStyle.qml | 0 .../ActivateAppSipAccountWithEmailStyle.qml | 0 .../ActivateAppSipAccountWithPhoneNumberStyle.qml | 0 .../Main/Assistant/AssistantAbstractViewStyle.qml | 0 .../Styles/Main/Assistant/AssistantHomeStyle.qml | 0 .../Main/Assistant/CreateAppSipAccountStyle.qml | 0 .../Styles/Main/Assistant/UseAppSipAccountStyle.qml | 0 .../ui/views/App/Styles/Main/AssistantStyle.qml | 0 .../ui/views/App/Styles/Main/ContactEditStyle.qml | 0 .../ui/views/App/Styles/Main/ContactsStyle.qml | 0 .../ui/views/App/Styles/Main/ConversationStyle.qml | 0 .../ui/views/App/Styles/Main/Dialogs/AboutStyle.qml | 0 .../Main/Dialogs/AuthenticationRequestStyle.qml | 0 .../App/Styles/Main/Dialogs/ManageAccountsStyle.qml | 0 .../ui/views/App/Styles/Main/HomeStyle.qml | 0 .../ui/views/App/Styles/Main/InviteFriendsStyle.qml | 0 .../ui/views/App/Styles/Main/MainWindowStyle.qml | 0 .../Dialogs/SettingsSipAccountsEditStyle.qml | 0 .../Settings/Dialogs/SettingsVideoPreviewStyle.qml | 0 .../App/Styles/Settings/SettingsAdvancedStyle.qml | 0 .../App/Styles/Settings/SettingsAudioStyle.qml | 0 .../App/Styles/Settings/SettingsWindowStyle.qml | 0 .../ui/views/App/Styles/qmldir | 0 720 files changed, 0 insertions(+), 0 deletions(-) rename {linphone-desktop => linphone-app}/CMakeLists.txt (100%) rename {linphone-desktop => linphone-app}/application_info.cmake (100%) rename {linphone-desktop => linphone-app}/assets/app-icon.rc (100%) rename {linphone-desktop => linphone-app}/assets/assistant/create-app-sip-account.rc (100%) rename {linphone-desktop => linphone-app}/assets/assistant/use-app-sip-account.rc (100%) rename {linphone-desktop => linphone-app}/assets/assistant/use-other-sip-account.rc (100%) rename {linphone-desktop => linphone-app}/assets/fonts/NotoSans-hinted/LICENSE_OFL.txt (100%) rename {linphone-desktop => linphone-app}/assets/fonts/NotoSans-hinted/NotoSans-Bold.ttf (100%) rename {linphone-desktop => linphone-app}/assets/fonts/NotoSans-hinted/NotoSans-BoldItalic.ttf (100%) rename {linphone-desktop => linphone-app}/assets/fonts/NotoSans-hinted/NotoSans-Italic.ttf (100%) rename {linphone-desktop => linphone-app}/assets/fonts/NotoSans-hinted/NotoSans-Regular.ttf (100%) rename {linphone-desktop => linphone-app}/assets/fonts/NotoSans-hinted/NotoSansUI-Bold.ttf (100%) rename {linphone-desktop => linphone-app}/assets/fonts/NotoSans-hinted/NotoSansUI-BoldItalic.ttf (100%) rename {linphone-desktop => linphone-app}/assets/fonts/NotoSans-hinted/NotoSansUI-Italic.ttf (100%) rename {linphone-desktop => linphone-app}/assets/fonts/NotoSans-hinted/NotoSansUI-Regular.ttf (100%) rename {linphone-desktop => linphone-app}/assets/fonts/NotoSans-hinted/README (100%) rename {linphone-desktop => linphone-app}/assets/icon.ico (100%) rename {linphone-desktop => linphone-app}/assets/icons/genicons.sh (100%) rename {linphone-desktop => linphone-app}/assets/icons/genicons_1.0.sh (100%) rename {linphone-desktop => linphone-app}/assets/icons/hicolor/128x128/apps/icon.png (100%) rename {linphone-desktop => linphone-app}/assets/icons/hicolor/16x16/apps/icon.png (100%) rename {linphone-desktop => linphone-app}/assets/icons/hicolor/22x22/apps/icon.png (100%) rename {linphone-desktop => linphone-app}/assets/icons/hicolor/24x24/apps/icon.png (100%) rename {linphone-desktop => linphone-app}/assets/icons/hicolor/256x256/apps/icon.png (100%) rename {linphone-desktop => linphone-app}/assets/icons/hicolor/32x32/apps/icon.png (100%) rename {linphone-desktop => linphone-app}/assets/icons/hicolor/64x64/apps/icon.png (100%) rename {linphone-desktop => linphone-app}/assets/images/add_disabled.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/add_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/add_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/add_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/attachment_disabled.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/attachment_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/attachment_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/attachment_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/auto_answer.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/burger_menu_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/burger_menu_light_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/burger_menu_light_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/burger_menu_light_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/burger_menu_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/burger_menu_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/call_accept_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/call_accept_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/call_accept_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/call_chat_secure_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/call_chat_secure_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/call_chat_secure_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/call_chat_unsecure_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/call_chat_unsecure_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/call_chat_unsecure_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/call_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/call_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/call_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/call_quality_0.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/call_quality_1.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/call_quality_2.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/call_quality_3.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/call_sign_connected.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/call_sign_ended.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/call_sign_incoming.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/call_sign_outgoing.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/call_sign_paused.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/camera.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/camera_off_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/camera_off_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/camera_off_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/camera_off_updating.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/camera_on_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/camera_on_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/camera_on_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/camera_on_updating.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/cancel_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/cancel_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/cancel_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/chat_amount.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/chat_count.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/chat_delivered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/chat_error.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/chat_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/chat_is_composing_0.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/chat_is_composing_1.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/chat_is_composing_2.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/chat_is_composing_3.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/chat_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/chat_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/chat_read.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/collapse.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/contact_add.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/contact_add_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/contact_add_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/contact_add_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/contact_card_photo_disabled.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/contact_card_photo_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/contact_card_photo_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/contact_card_photo_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/contact_edit_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/contact_edit_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/contact_edit_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/contact_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/contact_selected.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/declined_incoming_call.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/declined_outgoing_call.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/delete_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/delete_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/delete_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/download.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/drop_down.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/edit_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/edit_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/edit_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/ended_call.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/file_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/file_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/file_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/file_sign.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/filter.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/folder_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/folder_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/folder_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/fullscreen_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/fullscreen_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/fullscreen_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/generic_error.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/generic_error_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/generic_error_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/generic_error_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/hangup_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/hangup_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/hangup_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/history.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/history_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/history_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/history_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/home_account_assistant.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/home_invite_friends.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/home_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/home_selected.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/home_use_linphone.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/incoming_call.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/led_green.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/led_orange.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/led_red.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/led_white.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/linphone_logo.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/message_sign.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/micro.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/micro_off_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/micro_off_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/micro_off_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/micro_on_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/micro_on_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/micro_on_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/missed_incoming_call.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/missed_outgoing_call.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/new_call_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/new_call_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/new_call_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/new_conference_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/new_conference_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/new_conference_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/options_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/options_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/options_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/outgoing_call.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/pause_off_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/pause_off_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/pause_off_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/pause_off_updating.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/pause_on_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/pause_on_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/pause_on_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/pause_on_updating.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/record_off.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/record_on.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/recording_sign.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/screenshot_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/screenshot_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/screenshot_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/search.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/settings_advanced_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/settings_advanced_selected.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/settings_audio_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/settings_audio_selected.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/settings_call_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/settings_call_selected.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/settings_network_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/settings_network_selected.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/settings_sip_accounts_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/settings_sip_accounts_selected.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/settings_video_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/settings_video_selected.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/snapshot_sign.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/speaker.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/speaker_off_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/speaker_off_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/speaker_off_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/speaker_on_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/speaker_on_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/speaker_on_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/tel_keypad_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/tel_keypad_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/tel_keypad_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/timeline_history.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/tooltip_arrow_bottom.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/tooltip_arrow_left.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/tooltip_arrow_right.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/tooltip_arrow_top.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/transfer_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/transfer_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/transfer_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/update_sign.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/video_call_accept_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/video_call_accept_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/video_call_accept_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/video_call_hovered.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/video_call_normal.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/video_call_pressed.svg (100%) rename {linphone-desktop => linphone-app}/assets/images/warning.svg (100%) rename {linphone-desktop => linphone-app}/assets/languages/CMakeLists.txt (100%) rename {linphone-desktop => linphone-app}/assets/languages/ar.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/az.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/az@latin.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/cs.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/de.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/de_DE.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/el.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/en.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/es.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/es_AR.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/fi.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/fr_FR.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/he.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/hu.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/it.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/ja.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/ka.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/ko_KR.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/lt.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/mk_MK.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/nb_NO.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/nl.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/pl.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/pl_PL.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/pt_BR.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/ru.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/ru_RU.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/sr.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/sv.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/tr.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/uk.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/zh-Hant.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/zh.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/zh_CN.GB2312.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/zh_CN.ts (100%) rename {linphone-desktop => linphone-app}/assets/languages/zh_TW.ts (100%) rename {linphone-desktop => linphone-app}/assets/linphone.desktop.cmake (100%) rename {linphone-desktop => linphone-app}/assets/linphonerc-factory (100%) rename {linphone-desktop => linphone-app}/build/CMakeLists.txt (100%) rename {linphone-desktop => linphone-app}/build/rpm/linphone.spec.cmake (100%) rename {linphone-desktop => linphone-app}/build/rpm/qt5.spec (100%) rename {linphone-desktop => linphone-app}/cmake/FindMinizip.cmake (100%) rename {linphone-desktop => linphone-app}/cmake_builder/CMakeLists.txt (100%) rename {linphone-desktop => linphone-app}/cmake_builder/additional_steps.cmake (100%) rename {linphone-desktop => linphone-app}/cmake_builder/install.cmake (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/CMakeLists.txt (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/macos/Info.plist.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/macos/background_dmg.jpg (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/macos/linphone.icns (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/macos/linphone_dmg.scpt.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/packaging.cmake.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/sdk_content/antlr3c.list.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/sdk_content/bctoolbox.list.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/sdk_content/bcunit.list.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/sdk_content/bellesip.list.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/sdk_content/bv16.list.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/sdk_content/bzrtp.list.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/sdk_content/ffmpeg.list.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/sdk_content/gsm.list.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/sdk_content/linphone.list.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/sdk_content/linphonecxx.list.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/sdk_content/mbedtls.list.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/sdk_content/ms2.list.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/sdk_content/ms2plugins.list.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/sdk_content/opus.list.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/sdk_content/ortp.list.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/sdk_content/polarssl.list.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/sdk_content/speex.list.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/sdk_content/sqlite3.list.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/sdk_content/srtp.list.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/sdk_content/vcard.list.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/sdk_content/xml2.list.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/sdk_content/zlib.list.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/windows/NSIS.template.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/windows/install.nsi.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/windows/nsis_banner.bmp (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/windows/signtool.py (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/windows/uninstall.nsi.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphone_package/windows/winshortcut.vbs.in (100%) rename {linphone-desktop => linphone-app}/cmake_builder/linphoneqt.cmake (100%) rename {linphone-desktop => linphone-app}/resources.qrc (100%) rename {linphone-desktop => linphone-app}/src/app/App.cpp (100%) rename {linphone-desktop => linphone-app}/src/app/App.hpp (100%) rename {linphone-desktop => linphone-app}/src/app/AppController.cpp (100%) rename {linphone-desktop => linphone-app}/src/app/AppController.hpp (100%) rename {linphone-desktop => linphone-app}/src/app/cli/Cli.cpp (100%) rename {linphone-desktop => linphone-app}/src/app/cli/Cli.hpp (100%) rename {linphone-desktop => linphone-app}/src/app/logger/Logger.cpp (100%) rename {linphone-desktop => linphone-app}/src/app/logger/Logger.hpp (100%) rename {linphone-desktop => linphone-app}/src/app/main.cpp (100%) rename {linphone-desktop => linphone-app}/src/app/paths/Paths.cpp (100%) rename {linphone-desktop => linphone-app}/src/app/paths/Paths.hpp (100%) rename {linphone-desktop => linphone-app}/src/app/providers/AvatarProvider.cpp (100%) rename {linphone-desktop => linphone-app}/src/app/providers/AvatarProvider.hpp (100%) rename {linphone-desktop => linphone-app}/src/app/providers/ImageProvider.cpp (100%) rename {linphone-desktop => linphone-app}/src/app/providers/ImageProvider.hpp (100%) rename {linphone-desktop => linphone-app}/src/app/providers/ThumbnailProvider.cpp (100%) rename {linphone-desktop => linphone-app}/src/app/providers/ThumbnailProvider.hpp (100%) rename {linphone-desktop => linphone-app}/src/app/single-application/SingleApplication.cpp (100%) rename {linphone-desktop => linphone-app}/src/app/single-application/SingleApplication.hpp (100%) rename {linphone-desktop => linphone-app}/src/app/single-application/SingleApplicationDBus.cpp (100%) rename {linphone-desktop => linphone-app}/src/app/single-application/SingleApplicationDBusPrivate.hpp (100%) rename {linphone-desktop => linphone-app}/src/app/single-application/SingleApplicationPrivate.hpp (100%) rename {linphone-desktop => linphone-app}/src/app/translator/DefaultTranslator.cpp (100%) rename {linphone-desktop => linphone-app}/src/app/translator/DefaultTranslator.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/Components.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/assistant/AssistantModel.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/assistant/AssistantModel.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/authentication/AuthenticationNotifier.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/authentication/AuthenticationNotifier.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/call/CallModel.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/call/CallModel.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/calls/CallsListModel.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/calls/CallsListModel.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/calls/CallsListProxyModel.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/calls/CallsListProxyModel.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/camera/Camera.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/camera/Camera.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/camera/CameraPreview.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/camera/CameraPreview.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/camera/MSFunctions.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/camera/MSFunctions.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/chat/ChatModel.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/chat/ChatModel.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/chat/ChatProxyModel.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/chat/ChatProxyModel.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/codecs/AbstractCodecsModel.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/codecs/AbstractCodecsModel.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/codecs/AudioCodecsModel.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/codecs/AudioCodecsModel.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/codecs/VideoCodecsModel.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/codecs/VideoCodecsModel.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/conference/ConferenceAddModel.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/conference/ConferenceAddModel.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/conference/ConferenceHelperModel.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/conference/ConferenceHelperModel.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/conference/ConferenceModel.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/conference/ConferenceModel.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/contact/ContactModel.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/contact/ContactModel.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/contact/VcardModel.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/contact/VcardModel.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/contacts/ContactsListModel.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/contacts/ContactsListModel.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/contacts/ContactsListProxyModel.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/contacts/ContactsListProxyModel.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/core/CoreHandlers.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/core/CoreHandlers.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/core/CoreManager.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/core/CoreManager.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/core/event-count-notifier/AbstractEventCountNotifier.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/core/event-count-notifier/AbstractEventCountNotifier.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/core/event-count-notifier/EventCountNotifierMacOs.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/core/event-count-notifier/EventCountNotifierMacOs.m (100%) rename {linphone-desktop => linphone-app}/src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/file/FileDownloader.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/file/FileDownloader.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/file/FileExtractor.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/file/FileExtractor.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/notifier/Notifier.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/notifier/Notifier.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/other/clipboard/Clipboard.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/other/clipboard/Clipboard.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/other/colors/Colors.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/other/colors/Colors.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/other/desktop-tools/DesktopTools.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/other/desktop-tools/DesktopToolsLinux.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/other/desktop-tools/DesktopToolsLinux.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/other/desktop-tools/DesktopToolsMacOs.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/other/desktop-tools/DesktopToolsMacOs.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/other/desktop-tools/DesktopToolsWindows.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/other/desktop-tools/DesktopToolsWindows.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/other/desktop-tools/screen-saver/ScreenSaverDBus.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/other/desktop-tools/screen-saver/ScreenSaverDBus.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/other/desktop-tools/screen-saver/ScreenSaverMacOs.m (100%) rename {linphone-desktop => linphone-app}/src/components/other/desktop-tools/screen-saver/ScreenSaverXdg.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/other/desktop-tools/screen-saver/ScreenSaverXdg.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/other/desktop-tools/state-process/StateProcessMacOs.mm (100%) rename {linphone-desktop => linphone-app}/src/components/other/text-to-speech/TextToSpeech.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/other/text-to-speech/TextToSpeech.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/other/units/Units.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/other/units/Units.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/presence/OwnPresenceModel.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/presence/OwnPresenceModel.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/presence/Presence.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/presence/Presence.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/settings/AccountSettingsModel.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/settings/AccountSettingsModel.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/settings/SettingsModel.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/settings/SettingsModel.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/sip-addresses/SipAddressObserver.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/sip-addresses/SipAddressObserver.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/sip-addresses/SipAddressesModel.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/sip-addresses/SipAddressesModel.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/sip-addresses/SipAddressesProxyModel.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/sip-addresses/SipAddressesProxyModel.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/sound-player/SoundPlayer.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/sound-player/SoundPlayer.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/telephone-numbers/TelephoneNumbersModel.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/telephone-numbers/TelephoneNumbersModel.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/timeline/TimelineModel.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/timeline/TimelineModel.hpp (100%) rename {linphone-desktop => linphone-app}/src/components/url-handlers/UrlHandlers.cpp (100%) rename {linphone-desktop => linphone-app}/src/components/url-handlers/UrlHandlers.hpp (100%) rename {linphone-desktop => linphone-app}/src/config.h.cmake (100%) rename {linphone-desktop => linphone-app}/src/utils/LinphoneUtils.cpp (100%) rename {linphone-desktop => linphone-app}/src/utils/LinphoneUtils.hpp (100%) rename {linphone-desktop => linphone-app}/src/utils/MediastreamerUtils.cpp (100%) rename {linphone-desktop => linphone-app}/src/utils/MediastreamerUtils.hpp (100%) rename {linphone-desktop => linphone-app}/src/utils/QExifImageHeader.cpp (100%) rename {linphone-desktop => linphone-app}/src/utils/QExifImageHeader.hpp (100%) rename {linphone-desktop => linphone-app}/src/utils/Utils.cpp (100%) rename {linphone-desktop => linphone-app}/src/utils/Utils.hpp (100%) rename {linphone-desktop => linphone-app}/ui/dev-modules/Colors/Colors.qml (100%) rename {linphone-desktop => linphone-app}/ui/dev-modules/Colors/qmldir (100%) rename {linphone-desktop => linphone-app}/ui/dev-modules/Units/Units.qml (100%) rename {linphone-desktop => linphone-app}/ui/dev-modules/Units/qmldir (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Animations/BusyIndicator.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Constants/Constants.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Dialog/ConfirmDialog.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Dialog/DialogDescription.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Dialog/DialogPlus.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/ActionBar.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/ActionButton.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/ActionSwitch.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Buttons/AbstractTextButton.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Buttons/ExclusiveButtons.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Buttons/ExclusiveButtons.spec.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Buttons/FileChooserButton.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Buttons/SmallButton.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Buttons/TextButtonA.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Buttons/TextButtonB.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/CheckBoxText.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/ComboBox.js (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/ComboBox.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/CommonItemDelegate.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/DroppableTextArea.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Fields/HexField.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Fields/NumericField.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Fields/PasswordField.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Fields/PortField.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Fields/ScrollableListViewField.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Fields/TextAreaField.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Fields/TextField.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/ListForm.js (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/ListForm.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/ListItemSelector.js (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/ListItemSelector.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Placements/Form.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Placements/FormEmptyLine.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Placements/FormGroup.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Placements/FormHGroup.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Placements/FormLine.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Placements/FormTable.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Placements/FormTableEntry.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Placements/FormTableLine.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Placements/FormVGroup.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/SearchBox.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Slider.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/StaticListForm.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Switch.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Tab/TabBar.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Tab/TabButton.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/Tab/TabContainer.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Form/TransparentTextInput.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Helpers/DragBox.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Helpers/InvertedMouseArea.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Helpers/InvertedMouseArea.spec.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Image/Icon.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Image/RoundedImage.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Indicators/VuMeter.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Menus/ApplicationMenu.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Menus/ApplicationMenuEntry.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Menus/DropDownDynamicMenu.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Menus/DropDownStaticMenu.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Menus/DropDownStaticMenuEntry.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Menus/Menu.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Menus/MenuItem.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Misc/Borders.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Misc/ForceScrollBar.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Misc/Paned.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Popup/DesktopPopup.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Popup/Popup.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Popup/PopupShadow.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Animations/BusyIndicatorStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Dialog/DialogStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Form/ActionBarStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Form/Buttons/AbstractTextButtonStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Form/Buttons/FileChooserButtonStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Form/Buttons/TextButtonBStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Form/ComboBoxStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Form/CommonItemDelegateStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Form/DroppableTextAreaStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Form/Fields/TextAreaFieldStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Form/ListFormStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Form/Placements/FormHGroupStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Form/Placements/FormLineStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Form/Placements/FormStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Form/Placements/FormTableLineStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Form/Placements/FormTableStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Form/Placements/FormVGroupStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Form/SearchBoxStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Form/SliderStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Form/SwitchStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Form/Tab/TabContainerStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Indicators/VuMeterStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Menus/DropDownStaticMenuStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Menus/MenuItemStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Menus/MenuStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Misc/ForceScrollBarStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Misc/PanedStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Popup/PopupStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Tooltip/TooltipStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/Window/WindowStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Styles/qmldir (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Tooltip/Tooltip.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Tooltip/TooltipArea.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/View/ScrollableListView.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Window/ApplicationWindow.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Window/VirtualWindow.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Window/Window.js (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/Window/Window.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Common/qmldir (100%) rename {linphone-desktop => linphone-app}/ui/modules/Konami/Konami.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Konami/qmldir (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Account/AccountStatus.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Blocks/CardBlock.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Blocks/RequestBlock.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Calls/CallControls.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Calls/CallStatistics.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Calls/Calls.js (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Calls/Calls.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Calls/ConferenceControls.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Chat/Chat.js (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Chat/Chat.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Chat/Event.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Chat/FileMessage.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Chat/IncomingMessage.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Chat/Message.js (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Chat/Message.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Chat/OutgoingMessage.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Codecs/CodecAttribute.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Codecs/CodecLegend.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Codecs/CodecsViewer.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Contact/Avatar.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Contact/Contact.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Contact/ContactDescription.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Contact/ContactMessageCounter.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Dialog/OnlineInstallerDialog.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Menus/SipAddressesMenu.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Misc/MessageCounter.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Notifications/Notification.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Notifications/Notification.spec.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Notifications/NotificationBasic.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Notifications/NotificationNewVersionAvailable.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Notifications/NotificationReceivedCall.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Notifications/NotificationRecordingCompleted.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Notifications/NotificationSnapshotWasTaken.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Presence/PresenceLevel.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Styles/Blocks/CardBlockStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Styles/Blocks/RequestBlockStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Styles/Calls/CallControlsStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Styles/Calls/CallsStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Styles/Calls/ConferenceControlsStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Styles/Chat/ChatStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Styles/Contact/ContactMessageCounterStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Styles/Contact/ContactStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Styles/Menus/SipAddressesMenuStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Styles/Misc/MessageCounterStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Styles/Notifications/NotificationBasicStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Styles/Notifications/NotificationReceivedCallStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Styles/Notifications/NotificationReceivedFileMessageStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Styles/Notifications/NotificationStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Styles/TelKeypad/TelKeypadStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Styles/qmldir (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/TelKeypad/TelKeypad.js (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/TelKeypad/TelKeypad.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/TelKeypad/TelKeypadButton.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Timeline/Timeline.js (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/Timeline/Timeline.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/View/SipAddressesView.qml (100%) rename {linphone-desktop => linphone-app}/ui/modules/Linphone/qmldir (100%) rename {linphone-desktop => linphone-app}/ui/scripts/LinphoneUtils/linphone-utils.js (100%) rename {linphone-desktop => linphone-app}/ui/scripts/LinphoneUtils/qmldir (100%) rename {linphone-desktop => linphone-app}/ui/scripts/Utils/port-tools.js (100%) rename {linphone-desktop => linphone-app}/ui/scripts/Utils/qmldir (100%) rename {linphone-desktop => linphone-app}/ui/scripts/Utils/uri-tools.js (100%) rename {linphone-desktop => linphone-app}/ui/scripts/Utils/uri-tools.spec.qml (100%) rename {linphone-desktop => linphone-app}/ui/scripts/Utils/utils.js (100%) rename {linphone-desktop => linphone-app}/ui/scripts/Utils/utils.spec.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Calls/AbstractStartingCall.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Calls/CallsWindow.js (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Calls/CallsWindow.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Calls/Conference.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Calls/Dialogs/CallSipAddress.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Calls/Dialogs/CallTransfer.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Calls/Dialogs/ConferenceManager.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Calls/Dialogs/MultimediaParameters.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Calls/EndedCall.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Calls/Incall.js (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Calls/Incall.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Calls/IncallAvatar.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Calls/IncallFullscreenWindow.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Calls/IncomingCall.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Calls/OutgoingCall.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Calls/ZrtpTokenAuthentication.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/Assistant.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/Assistant/ActivateAppSipAccountWithEmail.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/Assistant/ActivateAppSipAccountWithPhoneNumber.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/Assistant/AssistantAbstractView.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/Assistant/AssistantHome.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/Assistant/CreateAppSipAccount.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/Assistant/CreateAppSipAccountWithEmail.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/Assistant/CreateAppSipAccountWithPhoneNumber.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/Assistant/FetchRemoteConfiguration.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/Assistant/UseAppSipAccount.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/Assistant/UseAppSipAccountWithPhoneNumber.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/Assistant/UseAppSipAccountWithUsername.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/Assistant/UseOtherSipAccount.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/ContactEdit.js (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/ContactEdit.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/Contacts.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/Conversation.js (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/Conversation.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/Dialogs/About.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/Dialogs/AuthenticationRequest.js (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/Dialogs/AuthenticationRequest.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/Dialogs/ManageAccount.js (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/Dialogs/ManageAccounts.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/Home.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/InviteFriends.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/MainWindow.js (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/MainWindow.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/MainWindowMenuBar.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Main/MainWindowTopMenuBar.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.js (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Settings/Dialogs/SettingsVideoPreview.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Settings/SettingsAdvanced.js (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Settings/SettingsAdvanced.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Settings/SettingsAudio.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Settings/SettingsCallsChat.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Settings/SettingsNetwork.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Settings/SettingsSipAccounts.js (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Settings/SettingsSipAccounts.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Settings/SettingsUi.js (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Settings/SettingsUi.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Settings/SettingsVideo.js (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Settings/SettingsVideo.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Settings/SettingsWindow.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Calls/CallStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Calls/CallsWindowStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Calls/ConferenceStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Calls/Dialogs/CallSipAddressStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Calls/Dialogs/CallTransferStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Calls/Dialogs/ConferenceManagerStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Calls/Dialogs/MultimediaParametersStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithEmailStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithPhoneNumberStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Main/Assistant/CreateAppSipAccountStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Main/Assistant/UseAppSipAccountStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Main/AssistantStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Main/ContactEditStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Main/ContactsStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Main/ConversationStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Main/Dialogs/AboutStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Main/Dialogs/AuthenticationRequestStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Main/HomeStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Main/InviteFriendsStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Main/MainWindowStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Settings/Dialogs/SettingsSipAccountsEditStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Settings/Dialogs/SettingsVideoPreviewStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Settings/SettingsAdvancedStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Settings/SettingsAudioStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/Settings/SettingsWindowStyle.qml (100%) rename {linphone-desktop => linphone-app}/ui/views/App/Styles/qmldir (100%) diff --git a/linphone-desktop/CMakeLists.txt b/linphone-app/CMakeLists.txt similarity index 100% rename from linphone-desktop/CMakeLists.txt rename to linphone-app/CMakeLists.txt diff --git a/linphone-desktop/application_info.cmake b/linphone-app/application_info.cmake similarity index 100% rename from linphone-desktop/application_info.cmake rename to linphone-app/application_info.cmake diff --git a/linphone-desktop/assets/app-icon.rc b/linphone-app/assets/app-icon.rc similarity index 100% rename from linphone-desktop/assets/app-icon.rc rename to linphone-app/assets/app-icon.rc diff --git a/linphone-desktop/assets/assistant/create-app-sip-account.rc b/linphone-app/assets/assistant/create-app-sip-account.rc similarity index 100% rename from linphone-desktop/assets/assistant/create-app-sip-account.rc rename to linphone-app/assets/assistant/create-app-sip-account.rc diff --git a/linphone-desktop/assets/assistant/use-app-sip-account.rc b/linphone-app/assets/assistant/use-app-sip-account.rc similarity index 100% rename from linphone-desktop/assets/assistant/use-app-sip-account.rc rename to linphone-app/assets/assistant/use-app-sip-account.rc diff --git a/linphone-desktop/assets/assistant/use-other-sip-account.rc b/linphone-app/assets/assistant/use-other-sip-account.rc similarity index 100% rename from linphone-desktop/assets/assistant/use-other-sip-account.rc rename to linphone-app/assets/assistant/use-other-sip-account.rc diff --git a/linphone-desktop/assets/fonts/NotoSans-hinted/LICENSE_OFL.txt b/linphone-app/assets/fonts/NotoSans-hinted/LICENSE_OFL.txt similarity index 100% rename from linphone-desktop/assets/fonts/NotoSans-hinted/LICENSE_OFL.txt rename to linphone-app/assets/fonts/NotoSans-hinted/LICENSE_OFL.txt diff --git a/linphone-desktop/assets/fonts/NotoSans-hinted/NotoSans-Bold.ttf b/linphone-app/assets/fonts/NotoSans-hinted/NotoSans-Bold.ttf similarity index 100% rename from linphone-desktop/assets/fonts/NotoSans-hinted/NotoSans-Bold.ttf rename to linphone-app/assets/fonts/NotoSans-hinted/NotoSans-Bold.ttf diff --git a/linphone-desktop/assets/fonts/NotoSans-hinted/NotoSans-BoldItalic.ttf b/linphone-app/assets/fonts/NotoSans-hinted/NotoSans-BoldItalic.ttf similarity index 100% rename from linphone-desktop/assets/fonts/NotoSans-hinted/NotoSans-BoldItalic.ttf rename to linphone-app/assets/fonts/NotoSans-hinted/NotoSans-BoldItalic.ttf diff --git a/linphone-desktop/assets/fonts/NotoSans-hinted/NotoSans-Italic.ttf b/linphone-app/assets/fonts/NotoSans-hinted/NotoSans-Italic.ttf similarity index 100% rename from linphone-desktop/assets/fonts/NotoSans-hinted/NotoSans-Italic.ttf rename to linphone-app/assets/fonts/NotoSans-hinted/NotoSans-Italic.ttf diff --git a/linphone-desktop/assets/fonts/NotoSans-hinted/NotoSans-Regular.ttf b/linphone-app/assets/fonts/NotoSans-hinted/NotoSans-Regular.ttf similarity index 100% rename from linphone-desktop/assets/fonts/NotoSans-hinted/NotoSans-Regular.ttf rename to linphone-app/assets/fonts/NotoSans-hinted/NotoSans-Regular.ttf diff --git a/linphone-desktop/assets/fonts/NotoSans-hinted/NotoSansUI-Bold.ttf b/linphone-app/assets/fonts/NotoSans-hinted/NotoSansUI-Bold.ttf similarity index 100% rename from linphone-desktop/assets/fonts/NotoSans-hinted/NotoSansUI-Bold.ttf rename to linphone-app/assets/fonts/NotoSans-hinted/NotoSansUI-Bold.ttf diff --git a/linphone-desktop/assets/fonts/NotoSans-hinted/NotoSansUI-BoldItalic.ttf b/linphone-app/assets/fonts/NotoSans-hinted/NotoSansUI-BoldItalic.ttf similarity index 100% rename from linphone-desktop/assets/fonts/NotoSans-hinted/NotoSansUI-BoldItalic.ttf rename to linphone-app/assets/fonts/NotoSans-hinted/NotoSansUI-BoldItalic.ttf diff --git a/linphone-desktop/assets/fonts/NotoSans-hinted/NotoSansUI-Italic.ttf b/linphone-app/assets/fonts/NotoSans-hinted/NotoSansUI-Italic.ttf similarity index 100% rename from linphone-desktop/assets/fonts/NotoSans-hinted/NotoSansUI-Italic.ttf rename to linphone-app/assets/fonts/NotoSans-hinted/NotoSansUI-Italic.ttf diff --git a/linphone-desktop/assets/fonts/NotoSans-hinted/NotoSansUI-Regular.ttf b/linphone-app/assets/fonts/NotoSans-hinted/NotoSansUI-Regular.ttf similarity index 100% rename from linphone-desktop/assets/fonts/NotoSans-hinted/NotoSansUI-Regular.ttf rename to linphone-app/assets/fonts/NotoSans-hinted/NotoSansUI-Regular.ttf diff --git a/linphone-desktop/assets/fonts/NotoSans-hinted/README b/linphone-app/assets/fonts/NotoSans-hinted/README similarity index 100% rename from linphone-desktop/assets/fonts/NotoSans-hinted/README rename to linphone-app/assets/fonts/NotoSans-hinted/README diff --git a/linphone-desktop/assets/icon.ico b/linphone-app/assets/icon.ico similarity index 100% rename from linphone-desktop/assets/icon.ico rename to linphone-app/assets/icon.ico diff --git a/linphone-desktop/assets/icons/genicons.sh b/linphone-app/assets/icons/genicons.sh similarity index 100% rename from linphone-desktop/assets/icons/genicons.sh rename to linphone-app/assets/icons/genicons.sh diff --git a/linphone-desktop/assets/icons/genicons_1.0.sh b/linphone-app/assets/icons/genicons_1.0.sh similarity index 100% rename from linphone-desktop/assets/icons/genicons_1.0.sh rename to linphone-app/assets/icons/genicons_1.0.sh diff --git a/linphone-desktop/assets/icons/hicolor/128x128/apps/icon.png b/linphone-app/assets/icons/hicolor/128x128/apps/icon.png similarity index 100% rename from linphone-desktop/assets/icons/hicolor/128x128/apps/icon.png rename to linphone-app/assets/icons/hicolor/128x128/apps/icon.png diff --git a/linphone-desktop/assets/icons/hicolor/16x16/apps/icon.png b/linphone-app/assets/icons/hicolor/16x16/apps/icon.png similarity index 100% rename from linphone-desktop/assets/icons/hicolor/16x16/apps/icon.png rename to linphone-app/assets/icons/hicolor/16x16/apps/icon.png diff --git a/linphone-desktop/assets/icons/hicolor/22x22/apps/icon.png b/linphone-app/assets/icons/hicolor/22x22/apps/icon.png similarity index 100% rename from linphone-desktop/assets/icons/hicolor/22x22/apps/icon.png rename to linphone-app/assets/icons/hicolor/22x22/apps/icon.png diff --git a/linphone-desktop/assets/icons/hicolor/24x24/apps/icon.png b/linphone-app/assets/icons/hicolor/24x24/apps/icon.png similarity index 100% rename from linphone-desktop/assets/icons/hicolor/24x24/apps/icon.png rename to linphone-app/assets/icons/hicolor/24x24/apps/icon.png diff --git a/linphone-desktop/assets/icons/hicolor/256x256/apps/icon.png b/linphone-app/assets/icons/hicolor/256x256/apps/icon.png similarity index 100% rename from linphone-desktop/assets/icons/hicolor/256x256/apps/icon.png rename to linphone-app/assets/icons/hicolor/256x256/apps/icon.png diff --git a/linphone-desktop/assets/icons/hicolor/32x32/apps/icon.png b/linphone-app/assets/icons/hicolor/32x32/apps/icon.png similarity index 100% rename from linphone-desktop/assets/icons/hicolor/32x32/apps/icon.png rename to linphone-app/assets/icons/hicolor/32x32/apps/icon.png diff --git a/linphone-desktop/assets/icons/hicolor/64x64/apps/icon.png b/linphone-app/assets/icons/hicolor/64x64/apps/icon.png similarity index 100% rename from linphone-desktop/assets/icons/hicolor/64x64/apps/icon.png rename to linphone-app/assets/icons/hicolor/64x64/apps/icon.png diff --git a/linphone-desktop/assets/images/add_disabled.svg b/linphone-app/assets/images/add_disabled.svg similarity index 100% rename from linphone-desktop/assets/images/add_disabled.svg rename to linphone-app/assets/images/add_disabled.svg diff --git a/linphone-desktop/assets/images/add_hovered.svg b/linphone-app/assets/images/add_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/add_hovered.svg rename to linphone-app/assets/images/add_hovered.svg diff --git a/linphone-desktop/assets/images/add_normal.svg b/linphone-app/assets/images/add_normal.svg similarity index 100% rename from linphone-desktop/assets/images/add_normal.svg rename to linphone-app/assets/images/add_normal.svg diff --git a/linphone-desktop/assets/images/add_pressed.svg b/linphone-app/assets/images/add_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/add_pressed.svg rename to linphone-app/assets/images/add_pressed.svg diff --git a/linphone-desktop/assets/images/attachment_disabled.svg b/linphone-app/assets/images/attachment_disabled.svg similarity index 100% rename from linphone-desktop/assets/images/attachment_disabled.svg rename to linphone-app/assets/images/attachment_disabled.svg diff --git a/linphone-desktop/assets/images/attachment_hovered.svg b/linphone-app/assets/images/attachment_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/attachment_hovered.svg rename to linphone-app/assets/images/attachment_hovered.svg diff --git a/linphone-desktop/assets/images/attachment_normal.svg b/linphone-app/assets/images/attachment_normal.svg similarity index 100% rename from linphone-desktop/assets/images/attachment_normal.svg rename to linphone-app/assets/images/attachment_normal.svg diff --git a/linphone-desktop/assets/images/attachment_pressed.svg b/linphone-app/assets/images/attachment_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/attachment_pressed.svg rename to linphone-app/assets/images/attachment_pressed.svg diff --git a/linphone-desktop/assets/images/auto_answer.svg b/linphone-app/assets/images/auto_answer.svg similarity index 100% rename from linphone-desktop/assets/images/auto_answer.svg rename to linphone-app/assets/images/auto_answer.svg diff --git a/linphone-desktop/assets/images/burger_menu_hovered.svg b/linphone-app/assets/images/burger_menu_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/burger_menu_hovered.svg rename to linphone-app/assets/images/burger_menu_hovered.svg diff --git a/linphone-desktop/assets/images/burger_menu_light_hovered.svg b/linphone-app/assets/images/burger_menu_light_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/burger_menu_light_hovered.svg rename to linphone-app/assets/images/burger_menu_light_hovered.svg diff --git a/linphone-desktop/assets/images/burger_menu_light_normal.svg b/linphone-app/assets/images/burger_menu_light_normal.svg similarity index 100% rename from linphone-desktop/assets/images/burger_menu_light_normal.svg rename to linphone-app/assets/images/burger_menu_light_normal.svg diff --git a/linphone-desktop/assets/images/burger_menu_light_pressed.svg b/linphone-app/assets/images/burger_menu_light_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/burger_menu_light_pressed.svg rename to linphone-app/assets/images/burger_menu_light_pressed.svg diff --git a/linphone-desktop/assets/images/burger_menu_normal.svg b/linphone-app/assets/images/burger_menu_normal.svg similarity index 100% rename from linphone-desktop/assets/images/burger_menu_normal.svg rename to linphone-app/assets/images/burger_menu_normal.svg diff --git a/linphone-desktop/assets/images/burger_menu_pressed.svg b/linphone-app/assets/images/burger_menu_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/burger_menu_pressed.svg rename to linphone-app/assets/images/burger_menu_pressed.svg diff --git a/linphone-desktop/assets/images/call_accept_hovered.svg b/linphone-app/assets/images/call_accept_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/call_accept_hovered.svg rename to linphone-app/assets/images/call_accept_hovered.svg diff --git a/linphone-desktop/assets/images/call_accept_normal.svg b/linphone-app/assets/images/call_accept_normal.svg similarity index 100% rename from linphone-desktop/assets/images/call_accept_normal.svg rename to linphone-app/assets/images/call_accept_normal.svg diff --git a/linphone-desktop/assets/images/call_accept_pressed.svg b/linphone-app/assets/images/call_accept_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/call_accept_pressed.svg rename to linphone-app/assets/images/call_accept_pressed.svg diff --git a/linphone-desktop/assets/images/call_chat_secure_hovered.svg b/linphone-app/assets/images/call_chat_secure_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/call_chat_secure_hovered.svg rename to linphone-app/assets/images/call_chat_secure_hovered.svg diff --git a/linphone-desktop/assets/images/call_chat_secure_normal.svg b/linphone-app/assets/images/call_chat_secure_normal.svg similarity index 100% rename from linphone-desktop/assets/images/call_chat_secure_normal.svg rename to linphone-app/assets/images/call_chat_secure_normal.svg diff --git a/linphone-desktop/assets/images/call_chat_secure_pressed.svg b/linphone-app/assets/images/call_chat_secure_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/call_chat_secure_pressed.svg rename to linphone-app/assets/images/call_chat_secure_pressed.svg diff --git a/linphone-desktop/assets/images/call_chat_unsecure_hovered.svg b/linphone-app/assets/images/call_chat_unsecure_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/call_chat_unsecure_hovered.svg rename to linphone-app/assets/images/call_chat_unsecure_hovered.svg diff --git a/linphone-desktop/assets/images/call_chat_unsecure_normal.svg b/linphone-app/assets/images/call_chat_unsecure_normal.svg similarity index 100% rename from linphone-desktop/assets/images/call_chat_unsecure_normal.svg rename to linphone-app/assets/images/call_chat_unsecure_normal.svg diff --git a/linphone-desktop/assets/images/call_chat_unsecure_pressed.svg b/linphone-app/assets/images/call_chat_unsecure_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/call_chat_unsecure_pressed.svg rename to linphone-app/assets/images/call_chat_unsecure_pressed.svg diff --git a/linphone-desktop/assets/images/call_hovered.svg b/linphone-app/assets/images/call_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/call_hovered.svg rename to linphone-app/assets/images/call_hovered.svg diff --git a/linphone-desktop/assets/images/call_normal.svg b/linphone-app/assets/images/call_normal.svg similarity index 100% rename from linphone-desktop/assets/images/call_normal.svg rename to linphone-app/assets/images/call_normal.svg diff --git a/linphone-desktop/assets/images/call_pressed.svg b/linphone-app/assets/images/call_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/call_pressed.svg rename to linphone-app/assets/images/call_pressed.svg diff --git a/linphone-desktop/assets/images/call_quality_0.svg b/linphone-app/assets/images/call_quality_0.svg similarity index 100% rename from linphone-desktop/assets/images/call_quality_0.svg rename to linphone-app/assets/images/call_quality_0.svg diff --git a/linphone-desktop/assets/images/call_quality_1.svg b/linphone-app/assets/images/call_quality_1.svg similarity index 100% rename from linphone-desktop/assets/images/call_quality_1.svg rename to linphone-app/assets/images/call_quality_1.svg diff --git a/linphone-desktop/assets/images/call_quality_2.svg b/linphone-app/assets/images/call_quality_2.svg similarity index 100% rename from linphone-desktop/assets/images/call_quality_2.svg rename to linphone-app/assets/images/call_quality_2.svg diff --git a/linphone-desktop/assets/images/call_quality_3.svg b/linphone-app/assets/images/call_quality_3.svg similarity index 100% rename from linphone-desktop/assets/images/call_quality_3.svg rename to linphone-app/assets/images/call_quality_3.svg diff --git a/linphone-desktop/assets/images/call_sign_connected.svg b/linphone-app/assets/images/call_sign_connected.svg similarity index 100% rename from linphone-desktop/assets/images/call_sign_connected.svg rename to linphone-app/assets/images/call_sign_connected.svg diff --git a/linphone-desktop/assets/images/call_sign_ended.svg b/linphone-app/assets/images/call_sign_ended.svg similarity index 100% rename from linphone-desktop/assets/images/call_sign_ended.svg rename to linphone-app/assets/images/call_sign_ended.svg diff --git a/linphone-desktop/assets/images/call_sign_incoming.svg b/linphone-app/assets/images/call_sign_incoming.svg similarity index 100% rename from linphone-desktop/assets/images/call_sign_incoming.svg rename to linphone-app/assets/images/call_sign_incoming.svg diff --git a/linphone-desktop/assets/images/call_sign_outgoing.svg b/linphone-app/assets/images/call_sign_outgoing.svg similarity index 100% rename from linphone-desktop/assets/images/call_sign_outgoing.svg rename to linphone-app/assets/images/call_sign_outgoing.svg diff --git a/linphone-desktop/assets/images/call_sign_paused.svg b/linphone-app/assets/images/call_sign_paused.svg similarity index 100% rename from linphone-desktop/assets/images/call_sign_paused.svg rename to linphone-app/assets/images/call_sign_paused.svg diff --git a/linphone-desktop/assets/images/camera.svg b/linphone-app/assets/images/camera.svg similarity index 100% rename from linphone-desktop/assets/images/camera.svg rename to linphone-app/assets/images/camera.svg diff --git a/linphone-desktop/assets/images/camera_off_hovered.svg b/linphone-app/assets/images/camera_off_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/camera_off_hovered.svg rename to linphone-app/assets/images/camera_off_hovered.svg diff --git a/linphone-desktop/assets/images/camera_off_normal.svg b/linphone-app/assets/images/camera_off_normal.svg similarity index 100% rename from linphone-desktop/assets/images/camera_off_normal.svg rename to linphone-app/assets/images/camera_off_normal.svg diff --git a/linphone-desktop/assets/images/camera_off_pressed.svg b/linphone-app/assets/images/camera_off_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/camera_off_pressed.svg rename to linphone-app/assets/images/camera_off_pressed.svg diff --git a/linphone-desktop/assets/images/camera_off_updating.svg b/linphone-app/assets/images/camera_off_updating.svg similarity index 100% rename from linphone-desktop/assets/images/camera_off_updating.svg rename to linphone-app/assets/images/camera_off_updating.svg diff --git a/linphone-desktop/assets/images/camera_on_hovered.svg b/linphone-app/assets/images/camera_on_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/camera_on_hovered.svg rename to linphone-app/assets/images/camera_on_hovered.svg diff --git a/linphone-desktop/assets/images/camera_on_normal.svg b/linphone-app/assets/images/camera_on_normal.svg similarity index 100% rename from linphone-desktop/assets/images/camera_on_normal.svg rename to linphone-app/assets/images/camera_on_normal.svg diff --git a/linphone-desktop/assets/images/camera_on_pressed.svg b/linphone-app/assets/images/camera_on_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/camera_on_pressed.svg rename to linphone-app/assets/images/camera_on_pressed.svg diff --git a/linphone-desktop/assets/images/camera_on_updating.svg b/linphone-app/assets/images/camera_on_updating.svg similarity index 100% rename from linphone-desktop/assets/images/camera_on_updating.svg rename to linphone-app/assets/images/camera_on_updating.svg diff --git a/linphone-desktop/assets/images/cancel_hovered.svg b/linphone-app/assets/images/cancel_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/cancel_hovered.svg rename to linphone-app/assets/images/cancel_hovered.svg diff --git a/linphone-desktop/assets/images/cancel_normal.svg b/linphone-app/assets/images/cancel_normal.svg similarity index 100% rename from linphone-desktop/assets/images/cancel_normal.svg rename to linphone-app/assets/images/cancel_normal.svg diff --git a/linphone-desktop/assets/images/cancel_pressed.svg b/linphone-app/assets/images/cancel_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/cancel_pressed.svg rename to linphone-app/assets/images/cancel_pressed.svg diff --git a/linphone-desktop/assets/images/chat_amount.svg b/linphone-app/assets/images/chat_amount.svg similarity index 100% rename from linphone-desktop/assets/images/chat_amount.svg rename to linphone-app/assets/images/chat_amount.svg diff --git a/linphone-desktop/assets/images/chat_count.svg b/linphone-app/assets/images/chat_count.svg similarity index 100% rename from linphone-desktop/assets/images/chat_count.svg rename to linphone-app/assets/images/chat_count.svg diff --git a/linphone-desktop/assets/images/chat_delivered.svg b/linphone-app/assets/images/chat_delivered.svg similarity index 100% rename from linphone-desktop/assets/images/chat_delivered.svg rename to linphone-app/assets/images/chat_delivered.svg diff --git a/linphone-desktop/assets/images/chat_error.svg b/linphone-app/assets/images/chat_error.svg similarity index 100% rename from linphone-desktop/assets/images/chat_error.svg rename to linphone-app/assets/images/chat_error.svg diff --git a/linphone-desktop/assets/images/chat_hovered.svg b/linphone-app/assets/images/chat_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/chat_hovered.svg rename to linphone-app/assets/images/chat_hovered.svg diff --git a/linphone-desktop/assets/images/chat_is_composing_0.svg b/linphone-app/assets/images/chat_is_composing_0.svg similarity index 100% rename from linphone-desktop/assets/images/chat_is_composing_0.svg rename to linphone-app/assets/images/chat_is_composing_0.svg diff --git a/linphone-desktop/assets/images/chat_is_composing_1.svg b/linphone-app/assets/images/chat_is_composing_1.svg similarity index 100% rename from linphone-desktop/assets/images/chat_is_composing_1.svg rename to linphone-app/assets/images/chat_is_composing_1.svg diff --git a/linphone-desktop/assets/images/chat_is_composing_2.svg b/linphone-app/assets/images/chat_is_composing_2.svg similarity index 100% rename from linphone-desktop/assets/images/chat_is_composing_2.svg rename to linphone-app/assets/images/chat_is_composing_2.svg diff --git a/linphone-desktop/assets/images/chat_is_composing_3.svg b/linphone-app/assets/images/chat_is_composing_3.svg similarity index 100% rename from linphone-desktop/assets/images/chat_is_composing_3.svg rename to linphone-app/assets/images/chat_is_composing_3.svg diff --git a/linphone-desktop/assets/images/chat_normal.svg b/linphone-app/assets/images/chat_normal.svg similarity index 100% rename from linphone-desktop/assets/images/chat_normal.svg rename to linphone-app/assets/images/chat_normal.svg diff --git a/linphone-desktop/assets/images/chat_pressed.svg b/linphone-app/assets/images/chat_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/chat_pressed.svg rename to linphone-app/assets/images/chat_pressed.svg diff --git a/linphone-desktop/assets/images/chat_read.svg b/linphone-app/assets/images/chat_read.svg similarity index 100% rename from linphone-desktop/assets/images/chat_read.svg rename to linphone-app/assets/images/chat_read.svg diff --git a/linphone-desktop/assets/images/collapse.svg b/linphone-app/assets/images/collapse.svg similarity index 100% rename from linphone-desktop/assets/images/collapse.svg rename to linphone-app/assets/images/collapse.svg diff --git a/linphone-desktop/assets/images/contact_add.svg b/linphone-app/assets/images/contact_add.svg similarity index 100% rename from linphone-desktop/assets/images/contact_add.svg rename to linphone-app/assets/images/contact_add.svg diff --git a/linphone-desktop/assets/images/contact_add_hovered.svg b/linphone-app/assets/images/contact_add_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/contact_add_hovered.svg rename to linphone-app/assets/images/contact_add_hovered.svg diff --git a/linphone-desktop/assets/images/contact_add_normal.svg b/linphone-app/assets/images/contact_add_normal.svg similarity index 100% rename from linphone-desktop/assets/images/contact_add_normal.svg rename to linphone-app/assets/images/contact_add_normal.svg diff --git a/linphone-desktop/assets/images/contact_add_pressed.svg b/linphone-app/assets/images/contact_add_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/contact_add_pressed.svg rename to linphone-app/assets/images/contact_add_pressed.svg diff --git a/linphone-desktop/assets/images/contact_card_photo_disabled.svg b/linphone-app/assets/images/contact_card_photo_disabled.svg similarity index 100% rename from linphone-desktop/assets/images/contact_card_photo_disabled.svg rename to linphone-app/assets/images/contact_card_photo_disabled.svg diff --git a/linphone-desktop/assets/images/contact_card_photo_hovered.svg b/linphone-app/assets/images/contact_card_photo_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/contact_card_photo_hovered.svg rename to linphone-app/assets/images/contact_card_photo_hovered.svg diff --git a/linphone-desktop/assets/images/contact_card_photo_normal.svg b/linphone-app/assets/images/contact_card_photo_normal.svg similarity index 100% rename from linphone-desktop/assets/images/contact_card_photo_normal.svg rename to linphone-app/assets/images/contact_card_photo_normal.svg diff --git a/linphone-desktop/assets/images/contact_card_photo_pressed.svg b/linphone-app/assets/images/contact_card_photo_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/contact_card_photo_pressed.svg rename to linphone-app/assets/images/contact_card_photo_pressed.svg diff --git a/linphone-desktop/assets/images/contact_edit_hovered.svg b/linphone-app/assets/images/contact_edit_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/contact_edit_hovered.svg rename to linphone-app/assets/images/contact_edit_hovered.svg diff --git a/linphone-desktop/assets/images/contact_edit_normal.svg b/linphone-app/assets/images/contact_edit_normal.svg similarity index 100% rename from linphone-desktop/assets/images/contact_edit_normal.svg rename to linphone-app/assets/images/contact_edit_normal.svg diff --git a/linphone-desktop/assets/images/contact_edit_pressed.svg b/linphone-app/assets/images/contact_edit_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/contact_edit_pressed.svg rename to linphone-app/assets/images/contact_edit_pressed.svg diff --git a/linphone-desktop/assets/images/contact_normal.svg b/linphone-app/assets/images/contact_normal.svg similarity index 100% rename from linphone-desktop/assets/images/contact_normal.svg rename to linphone-app/assets/images/contact_normal.svg diff --git a/linphone-desktop/assets/images/contact_selected.svg b/linphone-app/assets/images/contact_selected.svg similarity index 100% rename from linphone-desktop/assets/images/contact_selected.svg rename to linphone-app/assets/images/contact_selected.svg diff --git a/linphone-desktop/assets/images/declined_incoming_call.svg b/linphone-app/assets/images/declined_incoming_call.svg similarity index 100% rename from linphone-desktop/assets/images/declined_incoming_call.svg rename to linphone-app/assets/images/declined_incoming_call.svg diff --git a/linphone-desktop/assets/images/declined_outgoing_call.svg b/linphone-app/assets/images/declined_outgoing_call.svg similarity index 100% rename from linphone-desktop/assets/images/declined_outgoing_call.svg rename to linphone-app/assets/images/declined_outgoing_call.svg diff --git a/linphone-desktop/assets/images/delete_hovered.svg b/linphone-app/assets/images/delete_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/delete_hovered.svg rename to linphone-app/assets/images/delete_hovered.svg diff --git a/linphone-desktop/assets/images/delete_normal.svg b/linphone-app/assets/images/delete_normal.svg similarity index 100% rename from linphone-desktop/assets/images/delete_normal.svg rename to linphone-app/assets/images/delete_normal.svg diff --git a/linphone-desktop/assets/images/delete_pressed.svg b/linphone-app/assets/images/delete_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/delete_pressed.svg rename to linphone-app/assets/images/delete_pressed.svg diff --git a/linphone-desktop/assets/images/download.svg b/linphone-app/assets/images/download.svg similarity index 100% rename from linphone-desktop/assets/images/download.svg rename to linphone-app/assets/images/download.svg diff --git a/linphone-desktop/assets/images/drop_down.svg b/linphone-app/assets/images/drop_down.svg similarity index 100% rename from linphone-desktop/assets/images/drop_down.svg rename to linphone-app/assets/images/drop_down.svg diff --git a/linphone-desktop/assets/images/edit_hovered.svg b/linphone-app/assets/images/edit_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/edit_hovered.svg rename to linphone-app/assets/images/edit_hovered.svg diff --git a/linphone-desktop/assets/images/edit_normal.svg b/linphone-app/assets/images/edit_normal.svg similarity index 100% rename from linphone-desktop/assets/images/edit_normal.svg rename to linphone-app/assets/images/edit_normal.svg diff --git a/linphone-desktop/assets/images/edit_pressed.svg b/linphone-app/assets/images/edit_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/edit_pressed.svg rename to linphone-app/assets/images/edit_pressed.svg diff --git a/linphone-desktop/assets/images/ended_call.svg b/linphone-app/assets/images/ended_call.svg similarity index 100% rename from linphone-desktop/assets/images/ended_call.svg rename to linphone-app/assets/images/ended_call.svg diff --git a/linphone-desktop/assets/images/file_hovered.svg b/linphone-app/assets/images/file_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/file_hovered.svg rename to linphone-app/assets/images/file_hovered.svg diff --git a/linphone-desktop/assets/images/file_normal.svg b/linphone-app/assets/images/file_normal.svg similarity index 100% rename from linphone-desktop/assets/images/file_normal.svg rename to linphone-app/assets/images/file_normal.svg diff --git a/linphone-desktop/assets/images/file_pressed.svg b/linphone-app/assets/images/file_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/file_pressed.svg rename to linphone-app/assets/images/file_pressed.svg diff --git a/linphone-desktop/assets/images/file_sign.svg b/linphone-app/assets/images/file_sign.svg similarity index 100% rename from linphone-desktop/assets/images/file_sign.svg rename to linphone-app/assets/images/file_sign.svg diff --git a/linphone-desktop/assets/images/filter.svg b/linphone-app/assets/images/filter.svg similarity index 100% rename from linphone-desktop/assets/images/filter.svg rename to linphone-app/assets/images/filter.svg diff --git a/linphone-desktop/assets/images/folder_hovered.svg b/linphone-app/assets/images/folder_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/folder_hovered.svg rename to linphone-app/assets/images/folder_hovered.svg diff --git a/linphone-desktop/assets/images/folder_normal.svg b/linphone-app/assets/images/folder_normal.svg similarity index 100% rename from linphone-desktop/assets/images/folder_normal.svg rename to linphone-app/assets/images/folder_normal.svg diff --git a/linphone-desktop/assets/images/folder_pressed.svg b/linphone-app/assets/images/folder_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/folder_pressed.svg rename to linphone-app/assets/images/folder_pressed.svg diff --git a/linphone-desktop/assets/images/fullscreen_hovered.svg b/linphone-app/assets/images/fullscreen_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/fullscreen_hovered.svg rename to linphone-app/assets/images/fullscreen_hovered.svg diff --git a/linphone-desktop/assets/images/fullscreen_normal.svg b/linphone-app/assets/images/fullscreen_normal.svg similarity index 100% rename from linphone-desktop/assets/images/fullscreen_normal.svg rename to linphone-app/assets/images/fullscreen_normal.svg diff --git a/linphone-desktop/assets/images/fullscreen_pressed.svg b/linphone-app/assets/images/fullscreen_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/fullscreen_pressed.svg rename to linphone-app/assets/images/fullscreen_pressed.svg diff --git a/linphone-desktop/assets/images/generic_error.svg b/linphone-app/assets/images/generic_error.svg similarity index 100% rename from linphone-desktop/assets/images/generic_error.svg rename to linphone-app/assets/images/generic_error.svg diff --git a/linphone-desktop/assets/images/generic_error_hovered.svg b/linphone-app/assets/images/generic_error_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/generic_error_hovered.svg rename to linphone-app/assets/images/generic_error_hovered.svg diff --git a/linphone-desktop/assets/images/generic_error_normal.svg b/linphone-app/assets/images/generic_error_normal.svg similarity index 100% rename from linphone-desktop/assets/images/generic_error_normal.svg rename to linphone-app/assets/images/generic_error_normal.svg diff --git a/linphone-desktop/assets/images/generic_error_pressed.svg b/linphone-app/assets/images/generic_error_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/generic_error_pressed.svg rename to linphone-app/assets/images/generic_error_pressed.svg diff --git a/linphone-desktop/assets/images/hangup_hovered.svg b/linphone-app/assets/images/hangup_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/hangup_hovered.svg rename to linphone-app/assets/images/hangup_hovered.svg diff --git a/linphone-desktop/assets/images/hangup_normal.svg b/linphone-app/assets/images/hangup_normal.svg similarity index 100% rename from linphone-desktop/assets/images/hangup_normal.svg rename to linphone-app/assets/images/hangup_normal.svg diff --git a/linphone-desktop/assets/images/hangup_pressed.svg b/linphone-app/assets/images/hangup_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/hangup_pressed.svg rename to linphone-app/assets/images/hangup_pressed.svg diff --git a/linphone-desktop/assets/images/history.svg b/linphone-app/assets/images/history.svg similarity index 100% rename from linphone-desktop/assets/images/history.svg rename to linphone-app/assets/images/history.svg diff --git a/linphone-desktop/assets/images/history_hovered.svg b/linphone-app/assets/images/history_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/history_hovered.svg rename to linphone-app/assets/images/history_hovered.svg diff --git a/linphone-desktop/assets/images/history_normal.svg b/linphone-app/assets/images/history_normal.svg similarity index 100% rename from linphone-desktop/assets/images/history_normal.svg rename to linphone-app/assets/images/history_normal.svg diff --git a/linphone-desktop/assets/images/history_pressed.svg b/linphone-app/assets/images/history_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/history_pressed.svg rename to linphone-app/assets/images/history_pressed.svg diff --git a/linphone-desktop/assets/images/home_account_assistant.svg b/linphone-app/assets/images/home_account_assistant.svg similarity index 100% rename from linphone-desktop/assets/images/home_account_assistant.svg rename to linphone-app/assets/images/home_account_assistant.svg diff --git a/linphone-desktop/assets/images/home_invite_friends.svg b/linphone-app/assets/images/home_invite_friends.svg similarity index 100% rename from linphone-desktop/assets/images/home_invite_friends.svg rename to linphone-app/assets/images/home_invite_friends.svg diff --git a/linphone-desktop/assets/images/home_normal.svg b/linphone-app/assets/images/home_normal.svg similarity index 100% rename from linphone-desktop/assets/images/home_normal.svg rename to linphone-app/assets/images/home_normal.svg diff --git a/linphone-desktop/assets/images/home_selected.svg b/linphone-app/assets/images/home_selected.svg similarity index 100% rename from linphone-desktop/assets/images/home_selected.svg rename to linphone-app/assets/images/home_selected.svg diff --git a/linphone-desktop/assets/images/home_use_linphone.svg b/linphone-app/assets/images/home_use_linphone.svg similarity index 100% rename from linphone-desktop/assets/images/home_use_linphone.svg rename to linphone-app/assets/images/home_use_linphone.svg diff --git a/linphone-desktop/assets/images/incoming_call.svg b/linphone-app/assets/images/incoming_call.svg similarity index 100% rename from linphone-desktop/assets/images/incoming_call.svg rename to linphone-app/assets/images/incoming_call.svg diff --git a/linphone-desktop/assets/images/led_green.svg b/linphone-app/assets/images/led_green.svg similarity index 100% rename from linphone-desktop/assets/images/led_green.svg rename to linphone-app/assets/images/led_green.svg diff --git a/linphone-desktop/assets/images/led_orange.svg b/linphone-app/assets/images/led_orange.svg similarity index 100% rename from linphone-desktop/assets/images/led_orange.svg rename to linphone-app/assets/images/led_orange.svg diff --git a/linphone-desktop/assets/images/led_red.svg b/linphone-app/assets/images/led_red.svg similarity index 100% rename from linphone-desktop/assets/images/led_red.svg rename to linphone-app/assets/images/led_red.svg diff --git a/linphone-desktop/assets/images/led_white.svg b/linphone-app/assets/images/led_white.svg similarity index 100% rename from linphone-desktop/assets/images/led_white.svg rename to linphone-app/assets/images/led_white.svg diff --git a/linphone-desktop/assets/images/linphone_logo.svg b/linphone-app/assets/images/linphone_logo.svg similarity index 100% rename from linphone-desktop/assets/images/linphone_logo.svg rename to linphone-app/assets/images/linphone_logo.svg diff --git a/linphone-desktop/assets/images/message_sign.svg b/linphone-app/assets/images/message_sign.svg similarity index 100% rename from linphone-desktop/assets/images/message_sign.svg rename to linphone-app/assets/images/message_sign.svg diff --git a/linphone-desktop/assets/images/micro.svg b/linphone-app/assets/images/micro.svg similarity index 100% rename from linphone-desktop/assets/images/micro.svg rename to linphone-app/assets/images/micro.svg diff --git a/linphone-desktop/assets/images/micro_off_hovered.svg b/linphone-app/assets/images/micro_off_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/micro_off_hovered.svg rename to linphone-app/assets/images/micro_off_hovered.svg diff --git a/linphone-desktop/assets/images/micro_off_normal.svg b/linphone-app/assets/images/micro_off_normal.svg similarity index 100% rename from linphone-desktop/assets/images/micro_off_normal.svg rename to linphone-app/assets/images/micro_off_normal.svg diff --git a/linphone-desktop/assets/images/micro_off_pressed.svg b/linphone-app/assets/images/micro_off_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/micro_off_pressed.svg rename to linphone-app/assets/images/micro_off_pressed.svg diff --git a/linphone-desktop/assets/images/micro_on_hovered.svg b/linphone-app/assets/images/micro_on_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/micro_on_hovered.svg rename to linphone-app/assets/images/micro_on_hovered.svg diff --git a/linphone-desktop/assets/images/micro_on_normal.svg b/linphone-app/assets/images/micro_on_normal.svg similarity index 100% rename from linphone-desktop/assets/images/micro_on_normal.svg rename to linphone-app/assets/images/micro_on_normal.svg diff --git a/linphone-desktop/assets/images/micro_on_pressed.svg b/linphone-app/assets/images/micro_on_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/micro_on_pressed.svg rename to linphone-app/assets/images/micro_on_pressed.svg diff --git a/linphone-desktop/assets/images/missed_incoming_call.svg b/linphone-app/assets/images/missed_incoming_call.svg similarity index 100% rename from linphone-desktop/assets/images/missed_incoming_call.svg rename to linphone-app/assets/images/missed_incoming_call.svg diff --git a/linphone-desktop/assets/images/missed_outgoing_call.svg b/linphone-app/assets/images/missed_outgoing_call.svg similarity index 100% rename from linphone-desktop/assets/images/missed_outgoing_call.svg rename to linphone-app/assets/images/missed_outgoing_call.svg diff --git a/linphone-desktop/assets/images/new_call_hovered.svg b/linphone-app/assets/images/new_call_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/new_call_hovered.svg rename to linphone-app/assets/images/new_call_hovered.svg diff --git a/linphone-desktop/assets/images/new_call_normal.svg b/linphone-app/assets/images/new_call_normal.svg similarity index 100% rename from linphone-desktop/assets/images/new_call_normal.svg rename to linphone-app/assets/images/new_call_normal.svg diff --git a/linphone-desktop/assets/images/new_call_pressed.svg b/linphone-app/assets/images/new_call_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/new_call_pressed.svg rename to linphone-app/assets/images/new_call_pressed.svg diff --git a/linphone-desktop/assets/images/new_conference_hovered.svg b/linphone-app/assets/images/new_conference_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/new_conference_hovered.svg rename to linphone-app/assets/images/new_conference_hovered.svg diff --git a/linphone-desktop/assets/images/new_conference_normal.svg b/linphone-app/assets/images/new_conference_normal.svg similarity index 100% rename from linphone-desktop/assets/images/new_conference_normal.svg rename to linphone-app/assets/images/new_conference_normal.svg diff --git a/linphone-desktop/assets/images/new_conference_pressed.svg b/linphone-app/assets/images/new_conference_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/new_conference_pressed.svg rename to linphone-app/assets/images/new_conference_pressed.svg diff --git a/linphone-desktop/assets/images/options_hovered.svg b/linphone-app/assets/images/options_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/options_hovered.svg rename to linphone-app/assets/images/options_hovered.svg diff --git a/linphone-desktop/assets/images/options_normal.svg b/linphone-app/assets/images/options_normal.svg similarity index 100% rename from linphone-desktop/assets/images/options_normal.svg rename to linphone-app/assets/images/options_normal.svg diff --git a/linphone-desktop/assets/images/options_pressed.svg b/linphone-app/assets/images/options_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/options_pressed.svg rename to linphone-app/assets/images/options_pressed.svg diff --git a/linphone-desktop/assets/images/outgoing_call.svg b/linphone-app/assets/images/outgoing_call.svg similarity index 100% rename from linphone-desktop/assets/images/outgoing_call.svg rename to linphone-app/assets/images/outgoing_call.svg diff --git a/linphone-desktop/assets/images/pause_off_hovered.svg b/linphone-app/assets/images/pause_off_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/pause_off_hovered.svg rename to linphone-app/assets/images/pause_off_hovered.svg diff --git a/linphone-desktop/assets/images/pause_off_normal.svg b/linphone-app/assets/images/pause_off_normal.svg similarity index 100% rename from linphone-desktop/assets/images/pause_off_normal.svg rename to linphone-app/assets/images/pause_off_normal.svg diff --git a/linphone-desktop/assets/images/pause_off_pressed.svg b/linphone-app/assets/images/pause_off_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/pause_off_pressed.svg rename to linphone-app/assets/images/pause_off_pressed.svg diff --git a/linphone-desktop/assets/images/pause_off_updating.svg b/linphone-app/assets/images/pause_off_updating.svg similarity index 100% rename from linphone-desktop/assets/images/pause_off_updating.svg rename to linphone-app/assets/images/pause_off_updating.svg diff --git a/linphone-desktop/assets/images/pause_on_hovered.svg b/linphone-app/assets/images/pause_on_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/pause_on_hovered.svg rename to linphone-app/assets/images/pause_on_hovered.svg diff --git a/linphone-desktop/assets/images/pause_on_normal.svg b/linphone-app/assets/images/pause_on_normal.svg similarity index 100% rename from linphone-desktop/assets/images/pause_on_normal.svg rename to linphone-app/assets/images/pause_on_normal.svg diff --git a/linphone-desktop/assets/images/pause_on_pressed.svg b/linphone-app/assets/images/pause_on_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/pause_on_pressed.svg rename to linphone-app/assets/images/pause_on_pressed.svg diff --git a/linphone-desktop/assets/images/pause_on_updating.svg b/linphone-app/assets/images/pause_on_updating.svg similarity index 100% rename from linphone-desktop/assets/images/pause_on_updating.svg rename to linphone-app/assets/images/pause_on_updating.svg diff --git a/linphone-desktop/assets/images/record_off.svg b/linphone-app/assets/images/record_off.svg similarity index 100% rename from linphone-desktop/assets/images/record_off.svg rename to linphone-app/assets/images/record_off.svg diff --git a/linphone-desktop/assets/images/record_on.svg b/linphone-app/assets/images/record_on.svg similarity index 100% rename from linphone-desktop/assets/images/record_on.svg rename to linphone-app/assets/images/record_on.svg diff --git a/linphone-desktop/assets/images/recording_sign.svg b/linphone-app/assets/images/recording_sign.svg similarity index 100% rename from linphone-desktop/assets/images/recording_sign.svg rename to linphone-app/assets/images/recording_sign.svg diff --git a/linphone-desktop/assets/images/screenshot_hovered.svg b/linphone-app/assets/images/screenshot_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/screenshot_hovered.svg rename to linphone-app/assets/images/screenshot_hovered.svg diff --git a/linphone-desktop/assets/images/screenshot_normal.svg b/linphone-app/assets/images/screenshot_normal.svg similarity index 100% rename from linphone-desktop/assets/images/screenshot_normal.svg rename to linphone-app/assets/images/screenshot_normal.svg diff --git a/linphone-desktop/assets/images/screenshot_pressed.svg b/linphone-app/assets/images/screenshot_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/screenshot_pressed.svg rename to linphone-app/assets/images/screenshot_pressed.svg diff --git a/linphone-desktop/assets/images/search.svg b/linphone-app/assets/images/search.svg similarity index 100% rename from linphone-desktop/assets/images/search.svg rename to linphone-app/assets/images/search.svg diff --git a/linphone-desktop/assets/images/settings_advanced_normal.svg b/linphone-app/assets/images/settings_advanced_normal.svg similarity index 100% rename from linphone-desktop/assets/images/settings_advanced_normal.svg rename to linphone-app/assets/images/settings_advanced_normal.svg diff --git a/linphone-desktop/assets/images/settings_advanced_selected.svg b/linphone-app/assets/images/settings_advanced_selected.svg similarity index 100% rename from linphone-desktop/assets/images/settings_advanced_selected.svg rename to linphone-app/assets/images/settings_advanced_selected.svg diff --git a/linphone-desktop/assets/images/settings_audio_normal.svg b/linphone-app/assets/images/settings_audio_normal.svg similarity index 100% rename from linphone-desktop/assets/images/settings_audio_normal.svg rename to linphone-app/assets/images/settings_audio_normal.svg diff --git a/linphone-desktop/assets/images/settings_audio_selected.svg b/linphone-app/assets/images/settings_audio_selected.svg similarity index 100% rename from linphone-desktop/assets/images/settings_audio_selected.svg rename to linphone-app/assets/images/settings_audio_selected.svg diff --git a/linphone-desktop/assets/images/settings_call_normal.svg b/linphone-app/assets/images/settings_call_normal.svg similarity index 100% rename from linphone-desktop/assets/images/settings_call_normal.svg rename to linphone-app/assets/images/settings_call_normal.svg diff --git a/linphone-desktop/assets/images/settings_call_selected.svg b/linphone-app/assets/images/settings_call_selected.svg similarity index 100% rename from linphone-desktop/assets/images/settings_call_selected.svg rename to linphone-app/assets/images/settings_call_selected.svg diff --git a/linphone-desktop/assets/images/settings_network_normal.svg b/linphone-app/assets/images/settings_network_normal.svg similarity index 100% rename from linphone-desktop/assets/images/settings_network_normal.svg rename to linphone-app/assets/images/settings_network_normal.svg diff --git a/linphone-desktop/assets/images/settings_network_selected.svg b/linphone-app/assets/images/settings_network_selected.svg similarity index 100% rename from linphone-desktop/assets/images/settings_network_selected.svg rename to linphone-app/assets/images/settings_network_selected.svg diff --git a/linphone-desktop/assets/images/settings_sip_accounts_normal.svg b/linphone-app/assets/images/settings_sip_accounts_normal.svg similarity index 100% rename from linphone-desktop/assets/images/settings_sip_accounts_normal.svg rename to linphone-app/assets/images/settings_sip_accounts_normal.svg diff --git a/linphone-desktop/assets/images/settings_sip_accounts_selected.svg b/linphone-app/assets/images/settings_sip_accounts_selected.svg similarity index 100% rename from linphone-desktop/assets/images/settings_sip_accounts_selected.svg rename to linphone-app/assets/images/settings_sip_accounts_selected.svg diff --git a/linphone-desktop/assets/images/settings_video_normal.svg b/linphone-app/assets/images/settings_video_normal.svg similarity index 100% rename from linphone-desktop/assets/images/settings_video_normal.svg rename to linphone-app/assets/images/settings_video_normal.svg diff --git a/linphone-desktop/assets/images/settings_video_selected.svg b/linphone-app/assets/images/settings_video_selected.svg similarity index 100% rename from linphone-desktop/assets/images/settings_video_selected.svg rename to linphone-app/assets/images/settings_video_selected.svg diff --git a/linphone-desktop/assets/images/snapshot_sign.svg b/linphone-app/assets/images/snapshot_sign.svg similarity index 100% rename from linphone-desktop/assets/images/snapshot_sign.svg rename to linphone-app/assets/images/snapshot_sign.svg diff --git a/linphone-desktop/assets/images/speaker.svg b/linphone-app/assets/images/speaker.svg similarity index 100% rename from linphone-desktop/assets/images/speaker.svg rename to linphone-app/assets/images/speaker.svg diff --git a/linphone-desktop/assets/images/speaker_off_hovered.svg b/linphone-app/assets/images/speaker_off_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/speaker_off_hovered.svg rename to linphone-app/assets/images/speaker_off_hovered.svg diff --git a/linphone-desktop/assets/images/speaker_off_normal.svg b/linphone-app/assets/images/speaker_off_normal.svg similarity index 100% rename from linphone-desktop/assets/images/speaker_off_normal.svg rename to linphone-app/assets/images/speaker_off_normal.svg diff --git a/linphone-desktop/assets/images/speaker_off_pressed.svg b/linphone-app/assets/images/speaker_off_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/speaker_off_pressed.svg rename to linphone-app/assets/images/speaker_off_pressed.svg diff --git a/linphone-desktop/assets/images/speaker_on_hovered.svg b/linphone-app/assets/images/speaker_on_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/speaker_on_hovered.svg rename to linphone-app/assets/images/speaker_on_hovered.svg diff --git a/linphone-desktop/assets/images/speaker_on_normal.svg b/linphone-app/assets/images/speaker_on_normal.svg similarity index 100% rename from linphone-desktop/assets/images/speaker_on_normal.svg rename to linphone-app/assets/images/speaker_on_normal.svg diff --git a/linphone-desktop/assets/images/speaker_on_pressed.svg b/linphone-app/assets/images/speaker_on_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/speaker_on_pressed.svg rename to linphone-app/assets/images/speaker_on_pressed.svg diff --git a/linphone-desktop/assets/images/tel_keypad_hovered.svg b/linphone-app/assets/images/tel_keypad_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/tel_keypad_hovered.svg rename to linphone-app/assets/images/tel_keypad_hovered.svg diff --git a/linphone-desktop/assets/images/tel_keypad_normal.svg b/linphone-app/assets/images/tel_keypad_normal.svg similarity index 100% rename from linphone-desktop/assets/images/tel_keypad_normal.svg rename to linphone-app/assets/images/tel_keypad_normal.svg diff --git a/linphone-desktop/assets/images/tel_keypad_pressed.svg b/linphone-app/assets/images/tel_keypad_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/tel_keypad_pressed.svg rename to linphone-app/assets/images/tel_keypad_pressed.svg diff --git a/linphone-desktop/assets/images/timeline_history.svg b/linphone-app/assets/images/timeline_history.svg similarity index 100% rename from linphone-desktop/assets/images/timeline_history.svg rename to linphone-app/assets/images/timeline_history.svg diff --git a/linphone-desktop/assets/images/tooltip_arrow_bottom.svg b/linphone-app/assets/images/tooltip_arrow_bottom.svg similarity index 100% rename from linphone-desktop/assets/images/tooltip_arrow_bottom.svg rename to linphone-app/assets/images/tooltip_arrow_bottom.svg diff --git a/linphone-desktop/assets/images/tooltip_arrow_left.svg b/linphone-app/assets/images/tooltip_arrow_left.svg similarity index 100% rename from linphone-desktop/assets/images/tooltip_arrow_left.svg rename to linphone-app/assets/images/tooltip_arrow_left.svg diff --git a/linphone-desktop/assets/images/tooltip_arrow_right.svg b/linphone-app/assets/images/tooltip_arrow_right.svg similarity index 100% rename from linphone-desktop/assets/images/tooltip_arrow_right.svg rename to linphone-app/assets/images/tooltip_arrow_right.svg diff --git a/linphone-desktop/assets/images/tooltip_arrow_top.svg b/linphone-app/assets/images/tooltip_arrow_top.svg similarity index 100% rename from linphone-desktop/assets/images/tooltip_arrow_top.svg rename to linphone-app/assets/images/tooltip_arrow_top.svg diff --git a/linphone-desktop/assets/images/transfer_hovered.svg b/linphone-app/assets/images/transfer_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/transfer_hovered.svg rename to linphone-app/assets/images/transfer_hovered.svg diff --git a/linphone-desktop/assets/images/transfer_normal.svg b/linphone-app/assets/images/transfer_normal.svg similarity index 100% rename from linphone-desktop/assets/images/transfer_normal.svg rename to linphone-app/assets/images/transfer_normal.svg diff --git a/linphone-desktop/assets/images/transfer_pressed.svg b/linphone-app/assets/images/transfer_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/transfer_pressed.svg rename to linphone-app/assets/images/transfer_pressed.svg diff --git a/linphone-desktop/assets/images/update_sign.svg b/linphone-app/assets/images/update_sign.svg similarity index 100% rename from linphone-desktop/assets/images/update_sign.svg rename to linphone-app/assets/images/update_sign.svg diff --git a/linphone-desktop/assets/images/video_call_accept_hovered.svg b/linphone-app/assets/images/video_call_accept_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/video_call_accept_hovered.svg rename to linphone-app/assets/images/video_call_accept_hovered.svg diff --git a/linphone-desktop/assets/images/video_call_accept_normal.svg b/linphone-app/assets/images/video_call_accept_normal.svg similarity index 100% rename from linphone-desktop/assets/images/video_call_accept_normal.svg rename to linphone-app/assets/images/video_call_accept_normal.svg diff --git a/linphone-desktop/assets/images/video_call_accept_pressed.svg b/linphone-app/assets/images/video_call_accept_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/video_call_accept_pressed.svg rename to linphone-app/assets/images/video_call_accept_pressed.svg diff --git a/linphone-desktop/assets/images/video_call_hovered.svg b/linphone-app/assets/images/video_call_hovered.svg similarity index 100% rename from linphone-desktop/assets/images/video_call_hovered.svg rename to linphone-app/assets/images/video_call_hovered.svg diff --git a/linphone-desktop/assets/images/video_call_normal.svg b/linphone-app/assets/images/video_call_normal.svg similarity index 100% rename from linphone-desktop/assets/images/video_call_normal.svg rename to linphone-app/assets/images/video_call_normal.svg diff --git a/linphone-desktop/assets/images/video_call_pressed.svg b/linphone-app/assets/images/video_call_pressed.svg similarity index 100% rename from linphone-desktop/assets/images/video_call_pressed.svg rename to linphone-app/assets/images/video_call_pressed.svg diff --git a/linphone-desktop/assets/images/warning.svg b/linphone-app/assets/images/warning.svg similarity index 100% rename from linphone-desktop/assets/images/warning.svg rename to linphone-app/assets/images/warning.svg diff --git a/linphone-desktop/assets/languages/CMakeLists.txt b/linphone-app/assets/languages/CMakeLists.txt similarity index 100% rename from linphone-desktop/assets/languages/CMakeLists.txt rename to linphone-app/assets/languages/CMakeLists.txt diff --git a/linphone-desktop/assets/languages/ar.ts b/linphone-app/assets/languages/ar.ts similarity index 100% rename from linphone-desktop/assets/languages/ar.ts rename to linphone-app/assets/languages/ar.ts diff --git a/linphone-desktop/assets/languages/az.ts b/linphone-app/assets/languages/az.ts similarity index 100% rename from linphone-desktop/assets/languages/az.ts rename to linphone-app/assets/languages/az.ts diff --git a/linphone-desktop/assets/languages/az@latin.ts b/linphone-app/assets/languages/az@latin.ts similarity index 100% rename from linphone-desktop/assets/languages/az@latin.ts rename to linphone-app/assets/languages/az@latin.ts diff --git a/linphone-desktop/assets/languages/cs.ts b/linphone-app/assets/languages/cs.ts similarity index 100% rename from linphone-desktop/assets/languages/cs.ts rename to linphone-app/assets/languages/cs.ts diff --git a/linphone-desktop/assets/languages/de.ts b/linphone-app/assets/languages/de.ts similarity index 100% rename from linphone-desktop/assets/languages/de.ts rename to linphone-app/assets/languages/de.ts diff --git a/linphone-desktop/assets/languages/de_DE.ts b/linphone-app/assets/languages/de_DE.ts similarity index 100% rename from linphone-desktop/assets/languages/de_DE.ts rename to linphone-app/assets/languages/de_DE.ts diff --git a/linphone-desktop/assets/languages/el.ts b/linphone-app/assets/languages/el.ts similarity index 100% rename from linphone-desktop/assets/languages/el.ts rename to linphone-app/assets/languages/el.ts diff --git a/linphone-desktop/assets/languages/en.ts b/linphone-app/assets/languages/en.ts similarity index 100% rename from linphone-desktop/assets/languages/en.ts rename to linphone-app/assets/languages/en.ts diff --git a/linphone-desktop/assets/languages/es.ts b/linphone-app/assets/languages/es.ts similarity index 100% rename from linphone-desktop/assets/languages/es.ts rename to linphone-app/assets/languages/es.ts diff --git a/linphone-desktop/assets/languages/es_AR.ts b/linphone-app/assets/languages/es_AR.ts similarity index 100% rename from linphone-desktop/assets/languages/es_AR.ts rename to linphone-app/assets/languages/es_AR.ts diff --git a/linphone-desktop/assets/languages/fi.ts b/linphone-app/assets/languages/fi.ts similarity index 100% rename from linphone-desktop/assets/languages/fi.ts rename to linphone-app/assets/languages/fi.ts diff --git a/linphone-desktop/assets/languages/fr_FR.ts b/linphone-app/assets/languages/fr_FR.ts similarity index 100% rename from linphone-desktop/assets/languages/fr_FR.ts rename to linphone-app/assets/languages/fr_FR.ts diff --git a/linphone-desktop/assets/languages/he.ts b/linphone-app/assets/languages/he.ts similarity index 100% rename from linphone-desktop/assets/languages/he.ts rename to linphone-app/assets/languages/he.ts diff --git a/linphone-desktop/assets/languages/hu.ts b/linphone-app/assets/languages/hu.ts similarity index 100% rename from linphone-desktop/assets/languages/hu.ts rename to linphone-app/assets/languages/hu.ts diff --git a/linphone-desktop/assets/languages/it.ts b/linphone-app/assets/languages/it.ts similarity index 100% rename from linphone-desktop/assets/languages/it.ts rename to linphone-app/assets/languages/it.ts diff --git a/linphone-desktop/assets/languages/ja.ts b/linphone-app/assets/languages/ja.ts similarity index 100% rename from linphone-desktop/assets/languages/ja.ts rename to linphone-app/assets/languages/ja.ts diff --git a/linphone-desktop/assets/languages/ka.ts b/linphone-app/assets/languages/ka.ts similarity index 100% rename from linphone-desktop/assets/languages/ka.ts rename to linphone-app/assets/languages/ka.ts diff --git a/linphone-desktop/assets/languages/ko_KR.ts b/linphone-app/assets/languages/ko_KR.ts similarity index 100% rename from linphone-desktop/assets/languages/ko_KR.ts rename to linphone-app/assets/languages/ko_KR.ts diff --git a/linphone-desktop/assets/languages/lt.ts b/linphone-app/assets/languages/lt.ts similarity index 100% rename from linphone-desktop/assets/languages/lt.ts rename to linphone-app/assets/languages/lt.ts diff --git a/linphone-desktop/assets/languages/mk_MK.ts b/linphone-app/assets/languages/mk_MK.ts similarity index 100% rename from linphone-desktop/assets/languages/mk_MK.ts rename to linphone-app/assets/languages/mk_MK.ts diff --git a/linphone-desktop/assets/languages/nb_NO.ts b/linphone-app/assets/languages/nb_NO.ts similarity index 100% rename from linphone-desktop/assets/languages/nb_NO.ts rename to linphone-app/assets/languages/nb_NO.ts diff --git a/linphone-desktop/assets/languages/nl.ts b/linphone-app/assets/languages/nl.ts similarity index 100% rename from linphone-desktop/assets/languages/nl.ts rename to linphone-app/assets/languages/nl.ts diff --git a/linphone-desktop/assets/languages/pl.ts b/linphone-app/assets/languages/pl.ts similarity index 100% rename from linphone-desktop/assets/languages/pl.ts rename to linphone-app/assets/languages/pl.ts diff --git a/linphone-desktop/assets/languages/pl_PL.ts b/linphone-app/assets/languages/pl_PL.ts similarity index 100% rename from linphone-desktop/assets/languages/pl_PL.ts rename to linphone-app/assets/languages/pl_PL.ts diff --git a/linphone-desktop/assets/languages/pt_BR.ts b/linphone-app/assets/languages/pt_BR.ts similarity index 100% rename from linphone-desktop/assets/languages/pt_BR.ts rename to linphone-app/assets/languages/pt_BR.ts diff --git a/linphone-desktop/assets/languages/ru.ts b/linphone-app/assets/languages/ru.ts similarity index 100% rename from linphone-desktop/assets/languages/ru.ts rename to linphone-app/assets/languages/ru.ts diff --git a/linphone-desktop/assets/languages/ru_RU.ts b/linphone-app/assets/languages/ru_RU.ts similarity index 100% rename from linphone-desktop/assets/languages/ru_RU.ts rename to linphone-app/assets/languages/ru_RU.ts diff --git a/linphone-desktop/assets/languages/sr.ts b/linphone-app/assets/languages/sr.ts similarity index 100% rename from linphone-desktop/assets/languages/sr.ts rename to linphone-app/assets/languages/sr.ts diff --git a/linphone-desktop/assets/languages/sv.ts b/linphone-app/assets/languages/sv.ts similarity index 100% rename from linphone-desktop/assets/languages/sv.ts rename to linphone-app/assets/languages/sv.ts diff --git a/linphone-desktop/assets/languages/tr.ts b/linphone-app/assets/languages/tr.ts similarity index 100% rename from linphone-desktop/assets/languages/tr.ts rename to linphone-app/assets/languages/tr.ts diff --git a/linphone-desktop/assets/languages/uk.ts b/linphone-app/assets/languages/uk.ts similarity index 100% rename from linphone-desktop/assets/languages/uk.ts rename to linphone-app/assets/languages/uk.ts diff --git a/linphone-desktop/assets/languages/zh-Hant.ts b/linphone-app/assets/languages/zh-Hant.ts similarity index 100% rename from linphone-desktop/assets/languages/zh-Hant.ts rename to linphone-app/assets/languages/zh-Hant.ts diff --git a/linphone-desktop/assets/languages/zh.ts b/linphone-app/assets/languages/zh.ts similarity index 100% rename from linphone-desktop/assets/languages/zh.ts rename to linphone-app/assets/languages/zh.ts diff --git a/linphone-desktop/assets/languages/zh_CN.GB2312.ts b/linphone-app/assets/languages/zh_CN.GB2312.ts similarity index 100% rename from linphone-desktop/assets/languages/zh_CN.GB2312.ts rename to linphone-app/assets/languages/zh_CN.GB2312.ts diff --git a/linphone-desktop/assets/languages/zh_CN.ts b/linphone-app/assets/languages/zh_CN.ts similarity index 100% rename from linphone-desktop/assets/languages/zh_CN.ts rename to linphone-app/assets/languages/zh_CN.ts diff --git a/linphone-desktop/assets/languages/zh_TW.ts b/linphone-app/assets/languages/zh_TW.ts similarity index 100% rename from linphone-desktop/assets/languages/zh_TW.ts rename to linphone-app/assets/languages/zh_TW.ts diff --git a/linphone-desktop/assets/linphone.desktop.cmake b/linphone-app/assets/linphone.desktop.cmake similarity index 100% rename from linphone-desktop/assets/linphone.desktop.cmake rename to linphone-app/assets/linphone.desktop.cmake diff --git a/linphone-desktop/assets/linphonerc-factory b/linphone-app/assets/linphonerc-factory similarity index 100% rename from linphone-desktop/assets/linphonerc-factory rename to linphone-app/assets/linphonerc-factory diff --git a/linphone-desktop/build/CMakeLists.txt b/linphone-app/build/CMakeLists.txt similarity index 100% rename from linphone-desktop/build/CMakeLists.txt rename to linphone-app/build/CMakeLists.txt diff --git a/linphone-desktop/build/rpm/linphone.spec.cmake b/linphone-app/build/rpm/linphone.spec.cmake similarity index 100% rename from linphone-desktop/build/rpm/linphone.spec.cmake rename to linphone-app/build/rpm/linphone.spec.cmake diff --git a/linphone-desktop/build/rpm/qt5.spec b/linphone-app/build/rpm/qt5.spec similarity index 100% rename from linphone-desktop/build/rpm/qt5.spec rename to linphone-app/build/rpm/qt5.spec diff --git a/linphone-desktop/cmake/FindMinizip.cmake b/linphone-app/cmake/FindMinizip.cmake similarity index 100% rename from linphone-desktop/cmake/FindMinizip.cmake rename to linphone-app/cmake/FindMinizip.cmake diff --git a/linphone-desktop/cmake_builder/CMakeLists.txt b/linphone-app/cmake_builder/CMakeLists.txt similarity index 100% rename from linphone-desktop/cmake_builder/CMakeLists.txt rename to linphone-app/cmake_builder/CMakeLists.txt diff --git a/linphone-desktop/cmake_builder/additional_steps.cmake b/linphone-app/cmake_builder/additional_steps.cmake similarity index 100% rename from linphone-desktop/cmake_builder/additional_steps.cmake rename to linphone-app/cmake_builder/additional_steps.cmake diff --git a/linphone-desktop/cmake_builder/install.cmake b/linphone-app/cmake_builder/install.cmake similarity index 100% rename from linphone-desktop/cmake_builder/install.cmake rename to linphone-app/cmake_builder/install.cmake diff --git a/linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/CMakeLists.txt rename to linphone-app/cmake_builder/linphone_package/CMakeLists.txt diff --git a/linphone-desktop/cmake_builder/linphone_package/macos/Info.plist.in b/linphone-app/cmake_builder/linphone_package/macos/Info.plist.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/macos/Info.plist.in rename to linphone-app/cmake_builder/linphone_package/macos/Info.plist.in diff --git a/linphone-desktop/cmake_builder/linphone_package/macos/background_dmg.jpg b/linphone-app/cmake_builder/linphone_package/macos/background_dmg.jpg similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/macos/background_dmg.jpg rename to linphone-app/cmake_builder/linphone_package/macos/background_dmg.jpg diff --git a/linphone-desktop/cmake_builder/linphone_package/macos/linphone.icns b/linphone-app/cmake_builder/linphone_package/macos/linphone.icns similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/macos/linphone.icns rename to linphone-app/cmake_builder/linphone_package/macos/linphone.icns diff --git a/linphone-desktop/cmake_builder/linphone_package/macos/linphone_dmg.scpt.in b/linphone-app/cmake_builder/linphone_package/macos/linphone_dmg.scpt.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/macos/linphone_dmg.scpt.in rename to linphone-app/cmake_builder/linphone_package/macos/linphone_dmg.scpt.in diff --git a/linphone-desktop/cmake_builder/linphone_package/packaging.cmake.in b/linphone-app/cmake_builder/linphone_package/packaging.cmake.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/packaging.cmake.in rename to linphone-app/cmake_builder/linphone_package/packaging.cmake.in diff --git a/linphone-desktop/cmake_builder/linphone_package/sdk_content/antlr3c.list.in b/linphone-app/cmake_builder/linphone_package/sdk_content/antlr3c.list.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/sdk_content/antlr3c.list.in rename to linphone-app/cmake_builder/linphone_package/sdk_content/antlr3c.list.in diff --git a/linphone-desktop/cmake_builder/linphone_package/sdk_content/bctoolbox.list.in b/linphone-app/cmake_builder/linphone_package/sdk_content/bctoolbox.list.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/sdk_content/bctoolbox.list.in rename to linphone-app/cmake_builder/linphone_package/sdk_content/bctoolbox.list.in diff --git a/linphone-desktop/cmake_builder/linphone_package/sdk_content/bcunit.list.in b/linphone-app/cmake_builder/linphone_package/sdk_content/bcunit.list.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/sdk_content/bcunit.list.in rename to linphone-app/cmake_builder/linphone_package/sdk_content/bcunit.list.in diff --git a/linphone-desktop/cmake_builder/linphone_package/sdk_content/bellesip.list.in b/linphone-app/cmake_builder/linphone_package/sdk_content/bellesip.list.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/sdk_content/bellesip.list.in rename to linphone-app/cmake_builder/linphone_package/sdk_content/bellesip.list.in diff --git a/linphone-desktop/cmake_builder/linphone_package/sdk_content/bv16.list.in b/linphone-app/cmake_builder/linphone_package/sdk_content/bv16.list.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/sdk_content/bv16.list.in rename to linphone-app/cmake_builder/linphone_package/sdk_content/bv16.list.in diff --git a/linphone-desktop/cmake_builder/linphone_package/sdk_content/bzrtp.list.in b/linphone-app/cmake_builder/linphone_package/sdk_content/bzrtp.list.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/sdk_content/bzrtp.list.in rename to linphone-app/cmake_builder/linphone_package/sdk_content/bzrtp.list.in diff --git a/linphone-desktop/cmake_builder/linphone_package/sdk_content/ffmpeg.list.in b/linphone-app/cmake_builder/linphone_package/sdk_content/ffmpeg.list.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/sdk_content/ffmpeg.list.in rename to linphone-app/cmake_builder/linphone_package/sdk_content/ffmpeg.list.in diff --git a/linphone-desktop/cmake_builder/linphone_package/sdk_content/gsm.list.in b/linphone-app/cmake_builder/linphone_package/sdk_content/gsm.list.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/sdk_content/gsm.list.in rename to linphone-app/cmake_builder/linphone_package/sdk_content/gsm.list.in diff --git a/linphone-desktop/cmake_builder/linphone_package/sdk_content/linphone.list.in b/linphone-app/cmake_builder/linphone_package/sdk_content/linphone.list.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/sdk_content/linphone.list.in rename to linphone-app/cmake_builder/linphone_package/sdk_content/linphone.list.in diff --git a/linphone-desktop/cmake_builder/linphone_package/sdk_content/linphonecxx.list.in b/linphone-app/cmake_builder/linphone_package/sdk_content/linphonecxx.list.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/sdk_content/linphonecxx.list.in rename to linphone-app/cmake_builder/linphone_package/sdk_content/linphonecxx.list.in diff --git a/linphone-desktop/cmake_builder/linphone_package/sdk_content/mbedtls.list.in b/linphone-app/cmake_builder/linphone_package/sdk_content/mbedtls.list.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/sdk_content/mbedtls.list.in rename to linphone-app/cmake_builder/linphone_package/sdk_content/mbedtls.list.in diff --git a/linphone-desktop/cmake_builder/linphone_package/sdk_content/ms2.list.in b/linphone-app/cmake_builder/linphone_package/sdk_content/ms2.list.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/sdk_content/ms2.list.in rename to linphone-app/cmake_builder/linphone_package/sdk_content/ms2.list.in diff --git a/linphone-desktop/cmake_builder/linphone_package/sdk_content/ms2plugins.list.in b/linphone-app/cmake_builder/linphone_package/sdk_content/ms2plugins.list.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/sdk_content/ms2plugins.list.in rename to linphone-app/cmake_builder/linphone_package/sdk_content/ms2plugins.list.in diff --git a/linphone-desktop/cmake_builder/linphone_package/sdk_content/opus.list.in b/linphone-app/cmake_builder/linphone_package/sdk_content/opus.list.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/sdk_content/opus.list.in rename to linphone-app/cmake_builder/linphone_package/sdk_content/opus.list.in diff --git a/linphone-desktop/cmake_builder/linphone_package/sdk_content/ortp.list.in b/linphone-app/cmake_builder/linphone_package/sdk_content/ortp.list.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/sdk_content/ortp.list.in rename to linphone-app/cmake_builder/linphone_package/sdk_content/ortp.list.in diff --git a/linphone-desktop/cmake_builder/linphone_package/sdk_content/polarssl.list.in b/linphone-app/cmake_builder/linphone_package/sdk_content/polarssl.list.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/sdk_content/polarssl.list.in rename to linphone-app/cmake_builder/linphone_package/sdk_content/polarssl.list.in diff --git a/linphone-desktop/cmake_builder/linphone_package/sdk_content/speex.list.in b/linphone-app/cmake_builder/linphone_package/sdk_content/speex.list.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/sdk_content/speex.list.in rename to linphone-app/cmake_builder/linphone_package/sdk_content/speex.list.in diff --git a/linphone-desktop/cmake_builder/linphone_package/sdk_content/sqlite3.list.in b/linphone-app/cmake_builder/linphone_package/sdk_content/sqlite3.list.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/sdk_content/sqlite3.list.in rename to linphone-app/cmake_builder/linphone_package/sdk_content/sqlite3.list.in diff --git a/linphone-desktop/cmake_builder/linphone_package/sdk_content/srtp.list.in b/linphone-app/cmake_builder/linphone_package/sdk_content/srtp.list.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/sdk_content/srtp.list.in rename to linphone-app/cmake_builder/linphone_package/sdk_content/srtp.list.in diff --git a/linphone-desktop/cmake_builder/linphone_package/sdk_content/vcard.list.in b/linphone-app/cmake_builder/linphone_package/sdk_content/vcard.list.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/sdk_content/vcard.list.in rename to linphone-app/cmake_builder/linphone_package/sdk_content/vcard.list.in diff --git a/linphone-desktop/cmake_builder/linphone_package/sdk_content/xml2.list.in b/linphone-app/cmake_builder/linphone_package/sdk_content/xml2.list.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/sdk_content/xml2.list.in rename to linphone-app/cmake_builder/linphone_package/sdk_content/xml2.list.in diff --git a/linphone-desktop/cmake_builder/linphone_package/sdk_content/zlib.list.in b/linphone-app/cmake_builder/linphone_package/sdk_content/zlib.list.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/sdk_content/zlib.list.in rename to linphone-app/cmake_builder/linphone_package/sdk_content/zlib.list.in diff --git a/linphone-desktop/cmake_builder/linphone_package/windows/NSIS.template.in b/linphone-app/cmake_builder/linphone_package/windows/NSIS.template.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/windows/NSIS.template.in rename to linphone-app/cmake_builder/linphone_package/windows/NSIS.template.in diff --git a/linphone-desktop/cmake_builder/linphone_package/windows/install.nsi.in b/linphone-app/cmake_builder/linphone_package/windows/install.nsi.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/windows/install.nsi.in rename to linphone-app/cmake_builder/linphone_package/windows/install.nsi.in diff --git a/linphone-desktop/cmake_builder/linphone_package/windows/nsis_banner.bmp b/linphone-app/cmake_builder/linphone_package/windows/nsis_banner.bmp similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/windows/nsis_banner.bmp rename to linphone-app/cmake_builder/linphone_package/windows/nsis_banner.bmp diff --git a/linphone-desktop/cmake_builder/linphone_package/windows/signtool.py b/linphone-app/cmake_builder/linphone_package/windows/signtool.py similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/windows/signtool.py rename to linphone-app/cmake_builder/linphone_package/windows/signtool.py diff --git a/linphone-desktop/cmake_builder/linphone_package/windows/uninstall.nsi.in b/linphone-app/cmake_builder/linphone_package/windows/uninstall.nsi.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/windows/uninstall.nsi.in rename to linphone-app/cmake_builder/linphone_package/windows/uninstall.nsi.in diff --git a/linphone-desktop/cmake_builder/linphone_package/windows/winshortcut.vbs.in b/linphone-app/cmake_builder/linphone_package/windows/winshortcut.vbs.in similarity index 100% rename from linphone-desktop/cmake_builder/linphone_package/windows/winshortcut.vbs.in rename to linphone-app/cmake_builder/linphone_package/windows/winshortcut.vbs.in diff --git a/linphone-desktop/cmake_builder/linphoneqt.cmake b/linphone-app/cmake_builder/linphoneqt.cmake similarity index 100% rename from linphone-desktop/cmake_builder/linphoneqt.cmake rename to linphone-app/cmake_builder/linphoneqt.cmake diff --git a/linphone-desktop/resources.qrc b/linphone-app/resources.qrc similarity index 100% rename from linphone-desktop/resources.qrc rename to linphone-app/resources.qrc diff --git a/linphone-desktop/src/app/App.cpp b/linphone-app/src/app/App.cpp similarity index 100% rename from linphone-desktop/src/app/App.cpp rename to linphone-app/src/app/App.cpp diff --git a/linphone-desktop/src/app/App.hpp b/linphone-app/src/app/App.hpp similarity index 100% rename from linphone-desktop/src/app/App.hpp rename to linphone-app/src/app/App.hpp diff --git a/linphone-desktop/src/app/AppController.cpp b/linphone-app/src/app/AppController.cpp similarity index 100% rename from linphone-desktop/src/app/AppController.cpp rename to linphone-app/src/app/AppController.cpp diff --git a/linphone-desktop/src/app/AppController.hpp b/linphone-app/src/app/AppController.hpp similarity index 100% rename from linphone-desktop/src/app/AppController.hpp rename to linphone-app/src/app/AppController.hpp diff --git a/linphone-desktop/src/app/cli/Cli.cpp b/linphone-app/src/app/cli/Cli.cpp similarity index 100% rename from linphone-desktop/src/app/cli/Cli.cpp rename to linphone-app/src/app/cli/Cli.cpp diff --git a/linphone-desktop/src/app/cli/Cli.hpp b/linphone-app/src/app/cli/Cli.hpp similarity index 100% rename from linphone-desktop/src/app/cli/Cli.hpp rename to linphone-app/src/app/cli/Cli.hpp diff --git a/linphone-desktop/src/app/logger/Logger.cpp b/linphone-app/src/app/logger/Logger.cpp similarity index 100% rename from linphone-desktop/src/app/logger/Logger.cpp rename to linphone-app/src/app/logger/Logger.cpp diff --git a/linphone-desktop/src/app/logger/Logger.hpp b/linphone-app/src/app/logger/Logger.hpp similarity index 100% rename from linphone-desktop/src/app/logger/Logger.hpp rename to linphone-app/src/app/logger/Logger.hpp diff --git a/linphone-desktop/src/app/main.cpp b/linphone-app/src/app/main.cpp similarity index 100% rename from linphone-desktop/src/app/main.cpp rename to linphone-app/src/app/main.cpp diff --git a/linphone-desktop/src/app/paths/Paths.cpp b/linphone-app/src/app/paths/Paths.cpp similarity index 100% rename from linphone-desktop/src/app/paths/Paths.cpp rename to linphone-app/src/app/paths/Paths.cpp diff --git a/linphone-desktop/src/app/paths/Paths.hpp b/linphone-app/src/app/paths/Paths.hpp similarity index 100% rename from linphone-desktop/src/app/paths/Paths.hpp rename to linphone-app/src/app/paths/Paths.hpp diff --git a/linphone-desktop/src/app/providers/AvatarProvider.cpp b/linphone-app/src/app/providers/AvatarProvider.cpp similarity index 100% rename from linphone-desktop/src/app/providers/AvatarProvider.cpp rename to linphone-app/src/app/providers/AvatarProvider.cpp diff --git a/linphone-desktop/src/app/providers/AvatarProvider.hpp b/linphone-app/src/app/providers/AvatarProvider.hpp similarity index 100% rename from linphone-desktop/src/app/providers/AvatarProvider.hpp rename to linphone-app/src/app/providers/AvatarProvider.hpp diff --git a/linphone-desktop/src/app/providers/ImageProvider.cpp b/linphone-app/src/app/providers/ImageProvider.cpp similarity index 100% rename from linphone-desktop/src/app/providers/ImageProvider.cpp rename to linphone-app/src/app/providers/ImageProvider.cpp diff --git a/linphone-desktop/src/app/providers/ImageProvider.hpp b/linphone-app/src/app/providers/ImageProvider.hpp similarity index 100% rename from linphone-desktop/src/app/providers/ImageProvider.hpp rename to linphone-app/src/app/providers/ImageProvider.hpp diff --git a/linphone-desktop/src/app/providers/ThumbnailProvider.cpp b/linphone-app/src/app/providers/ThumbnailProvider.cpp similarity index 100% rename from linphone-desktop/src/app/providers/ThumbnailProvider.cpp rename to linphone-app/src/app/providers/ThumbnailProvider.cpp diff --git a/linphone-desktop/src/app/providers/ThumbnailProvider.hpp b/linphone-app/src/app/providers/ThumbnailProvider.hpp similarity index 100% rename from linphone-desktop/src/app/providers/ThumbnailProvider.hpp rename to linphone-app/src/app/providers/ThumbnailProvider.hpp diff --git a/linphone-desktop/src/app/single-application/SingleApplication.cpp b/linphone-app/src/app/single-application/SingleApplication.cpp similarity index 100% rename from linphone-desktop/src/app/single-application/SingleApplication.cpp rename to linphone-app/src/app/single-application/SingleApplication.cpp diff --git a/linphone-desktop/src/app/single-application/SingleApplication.hpp b/linphone-app/src/app/single-application/SingleApplication.hpp similarity index 100% rename from linphone-desktop/src/app/single-application/SingleApplication.hpp rename to linphone-app/src/app/single-application/SingleApplication.hpp diff --git a/linphone-desktop/src/app/single-application/SingleApplicationDBus.cpp b/linphone-app/src/app/single-application/SingleApplicationDBus.cpp similarity index 100% rename from linphone-desktop/src/app/single-application/SingleApplicationDBus.cpp rename to linphone-app/src/app/single-application/SingleApplicationDBus.cpp diff --git a/linphone-desktop/src/app/single-application/SingleApplicationDBusPrivate.hpp b/linphone-app/src/app/single-application/SingleApplicationDBusPrivate.hpp similarity index 100% rename from linphone-desktop/src/app/single-application/SingleApplicationDBusPrivate.hpp rename to linphone-app/src/app/single-application/SingleApplicationDBusPrivate.hpp diff --git a/linphone-desktop/src/app/single-application/SingleApplicationPrivate.hpp b/linphone-app/src/app/single-application/SingleApplicationPrivate.hpp similarity index 100% rename from linphone-desktop/src/app/single-application/SingleApplicationPrivate.hpp rename to linphone-app/src/app/single-application/SingleApplicationPrivate.hpp diff --git a/linphone-desktop/src/app/translator/DefaultTranslator.cpp b/linphone-app/src/app/translator/DefaultTranslator.cpp similarity index 100% rename from linphone-desktop/src/app/translator/DefaultTranslator.cpp rename to linphone-app/src/app/translator/DefaultTranslator.cpp diff --git a/linphone-desktop/src/app/translator/DefaultTranslator.hpp b/linphone-app/src/app/translator/DefaultTranslator.hpp similarity index 100% rename from linphone-desktop/src/app/translator/DefaultTranslator.hpp rename to linphone-app/src/app/translator/DefaultTranslator.hpp diff --git a/linphone-desktop/src/components/Components.hpp b/linphone-app/src/components/Components.hpp similarity index 100% rename from linphone-desktop/src/components/Components.hpp rename to linphone-app/src/components/Components.hpp diff --git a/linphone-desktop/src/components/assistant/AssistantModel.cpp b/linphone-app/src/components/assistant/AssistantModel.cpp similarity index 100% rename from linphone-desktop/src/components/assistant/AssistantModel.cpp rename to linphone-app/src/components/assistant/AssistantModel.cpp diff --git a/linphone-desktop/src/components/assistant/AssistantModel.hpp b/linphone-app/src/components/assistant/AssistantModel.hpp similarity index 100% rename from linphone-desktop/src/components/assistant/AssistantModel.hpp rename to linphone-app/src/components/assistant/AssistantModel.hpp diff --git a/linphone-desktop/src/components/authentication/AuthenticationNotifier.cpp b/linphone-app/src/components/authentication/AuthenticationNotifier.cpp similarity index 100% rename from linphone-desktop/src/components/authentication/AuthenticationNotifier.cpp rename to linphone-app/src/components/authentication/AuthenticationNotifier.cpp diff --git a/linphone-desktop/src/components/authentication/AuthenticationNotifier.hpp b/linphone-app/src/components/authentication/AuthenticationNotifier.hpp similarity index 100% rename from linphone-desktop/src/components/authentication/AuthenticationNotifier.hpp rename to linphone-app/src/components/authentication/AuthenticationNotifier.hpp diff --git a/linphone-desktop/src/components/call/CallModel.cpp b/linphone-app/src/components/call/CallModel.cpp similarity index 100% rename from linphone-desktop/src/components/call/CallModel.cpp rename to linphone-app/src/components/call/CallModel.cpp diff --git a/linphone-desktop/src/components/call/CallModel.hpp b/linphone-app/src/components/call/CallModel.hpp similarity index 100% rename from linphone-desktop/src/components/call/CallModel.hpp rename to linphone-app/src/components/call/CallModel.hpp diff --git a/linphone-desktop/src/components/calls/CallsListModel.cpp b/linphone-app/src/components/calls/CallsListModel.cpp similarity index 100% rename from linphone-desktop/src/components/calls/CallsListModel.cpp rename to linphone-app/src/components/calls/CallsListModel.cpp diff --git a/linphone-desktop/src/components/calls/CallsListModel.hpp b/linphone-app/src/components/calls/CallsListModel.hpp similarity index 100% rename from linphone-desktop/src/components/calls/CallsListModel.hpp rename to linphone-app/src/components/calls/CallsListModel.hpp diff --git a/linphone-desktop/src/components/calls/CallsListProxyModel.cpp b/linphone-app/src/components/calls/CallsListProxyModel.cpp similarity index 100% rename from linphone-desktop/src/components/calls/CallsListProxyModel.cpp rename to linphone-app/src/components/calls/CallsListProxyModel.cpp diff --git a/linphone-desktop/src/components/calls/CallsListProxyModel.hpp b/linphone-app/src/components/calls/CallsListProxyModel.hpp similarity index 100% rename from linphone-desktop/src/components/calls/CallsListProxyModel.hpp rename to linphone-app/src/components/calls/CallsListProxyModel.hpp diff --git a/linphone-desktop/src/components/camera/Camera.cpp b/linphone-app/src/components/camera/Camera.cpp similarity index 100% rename from linphone-desktop/src/components/camera/Camera.cpp rename to linphone-app/src/components/camera/Camera.cpp diff --git a/linphone-desktop/src/components/camera/Camera.hpp b/linphone-app/src/components/camera/Camera.hpp similarity index 100% rename from linphone-desktop/src/components/camera/Camera.hpp rename to linphone-app/src/components/camera/Camera.hpp diff --git a/linphone-desktop/src/components/camera/CameraPreview.cpp b/linphone-app/src/components/camera/CameraPreview.cpp similarity index 100% rename from linphone-desktop/src/components/camera/CameraPreview.cpp rename to linphone-app/src/components/camera/CameraPreview.cpp diff --git a/linphone-desktop/src/components/camera/CameraPreview.hpp b/linphone-app/src/components/camera/CameraPreview.hpp similarity index 100% rename from linphone-desktop/src/components/camera/CameraPreview.hpp rename to linphone-app/src/components/camera/CameraPreview.hpp diff --git a/linphone-desktop/src/components/camera/MSFunctions.cpp b/linphone-app/src/components/camera/MSFunctions.cpp similarity index 100% rename from linphone-desktop/src/components/camera/MSFunctions.cpp rename to linphone-app/src/components/camera/MSFunctions.cpp diff --git a/linphone-desktop/src/components/camera/MSFunctions.hpp b/linphone-app/src/components/camera/MSFunctions.hpp similarity index 100% rename from linphone-desktop/src/components/camera/MSFunctions.hpp rename to linphone-app/src/components/camera/MSFunctions.hpp diff --git a/linphone-desktop/src/components/chat/ChatModel.cpp b/linphone-app/src/components/chat/ChatModel.cpp similarity index 100% rename from linphone-desktop/src/components/chat/ChatModel.cpp rename to linphone-app/src/components/chat/ChatModel.cpp diff --git a/linphone-desktop/src/components/chat/ChatModel.hpp b/linphone-app/src/components/chat/ChatModel.hpp similarity index 100% rename from linphone-desktop/src/components/chat/ChatModel.hpp rename to linphone-app/src/components/chat/ChatModel.hpp diff --git a/linphone-desktop/src/components/chat/ChatProxyModel.cpp b/linphone-app/src/components/chat/ChatProxyModel.cpp similarity index 100% rename from linphone-desktop/src/components/chat/ChatProxyModel.cpp rename to linphone-app/src/components/chat/ChatProxyModel.cpp diff --git a/linphone-desktop/src/components/chat/ChatProxyModel.hpp b/linphone-app/src/components/chat/ChatProxyModel.hpp similarity index 100% rename from linphone-desktop/src/components/chat/ChatProxyModel.hpp rename to linphone-app/src/components/chat/ChatProxyModel.hpp diff --git a/linphone-desktop/src/components/codecs/AbstractCodecsModel.cpp b/linphone-app/src/components/codecs/AbstractCodecsModel.cpp similarity index 100% rename from linphone-desktop/src/components/codecs/AbstractCodecsModel.cpp rename to linphone-app/src/components/codecs/AbstractCodecsModel.cpp diff --git a/linphone-desktop/src/components/codecs/AbstractCodecsModel.hpp b/linphone-app/src/components/codecs/AbstractCodecsModel.hpp similarity index 100% rename from linphone-desktop/src/components/codecs/AbstractCodecsModel.hpp rename to linphone-app/src/components/codecs/AbstractCodecsModel.hpp diff --git a/linphone-desktop/src/components/codecs/AudioCodecsModel.cpp b/linphone-app/src/components/codecs/AudioCodecsModel.cpp similarity index 100% rename from linphone-desktop/src/components/codecs/AudioCodecsModel.cpp rename to linphone-app/src/components/codecs/AudioCodecsModel.cpp diff --git a/linphone-desktop/src/components/codecs/AudioCodecsModel.hpp b/linphone-app/src/components/codecs/AudioCodecsModel.hpp similarity index 100% rename from linphone-desktop/src/components/codecs/AudioCodecsModel.hpp rename to linphone-app/src/components/codecs/AudioCodecsModel.hpp diff --git a/linphone-desktop/src/components/codecs/VideoCodecsModel.cpp b/linphone-app/src/components/codecs/VideoCodecsModel.cpp similarity index 100% rename from linphone-desktop/src/components/codecs/VideoCodecsModel.cpp rename to linphone-app/src/components/codecs/VideoCodecsModel.cpp diff --git a/linphone-desktop/src/components/codecs/VideoCodecsModel.hpp b/linphone-app/src/components/codecs/VideoCodecsModel.hpp similarity index 100% rename from linphone-desktop/src/components/codecs/VideoCodecsModel.hpp rename to linphone-app/src/components/codecs/VideoCodecsModel.hpp diff --git a/linphone-desktop/src/components/conference/ConferenceAddModel.cpp b/linphone-app/src/components/conference/ConferenceAddModel.cpp similarity index 100% rename from linphone-desktop/src/components/conference/ConferenceAddModel.cpp rename to linphone-app/src/components/conference/ConferenceAddModel.cpp diff --git a/linphone-desktop/src/components/conference/ConferenceAddModel.hpp b/linphone-app/src/components/conference/ConferenceAddModel.hpp similarity index 100% rename from linphone-desktop/src/components/conference/ConferenceAddModel.hpp rename to linphone-app/src/components/conference/ConferenceAddModel.hpp diff --git a/linphone-desktop/src/components/conference/ConferenceHelperModel.cpp b/linphone-app/src/components/conference/ConferenceHelperModel.cpp similarity index 100% rename from linphone-desktop/src/components/conference/ConferenceHelperModel.cpp rename to linphone-app/src/components/conference/ConferenceHelperModel.cpp diff --git a/linphone-desktop/src/components/conference/ConferenceHelperModel.hpp b/linphone-app/src/components/conference/ConferenceHelperModel.hpp similarity index 100% rename from linphone-desktop/src/components/conference/ConferenceHelperModel.hpp rename to linphone-app/src/components/conference/ConferenceHelperModel.hpp diff --git a/linphone-desktop/src/components/conference/ConferenceModel.cpp b/linphone-app/src/components/conference/ConferenceModel.cpp similarity index 100% rename from linphone-desktop/src/components/conference/ConferenceModel.cpp rename to linphone-app/src/components/conference/ConferenceModel.cpp diff --git a/linphone-desktop/src/components/conference/ConferenceModel.hpp b/linphone-app/src/components/conference/ConferenceModel.hpp similarity index 100% rename from linphone-desktop/src/components/conference/ConferenceModel.hpp rename to linphone-app/src/components/conference/ConferenceModel.hpp diff --git a/linphone-desktop/src/components/contact/ContactModel.cpp b/linphone-app/src/components/contact/ContactModel.cpp similarity index 100% rename from linphone-desktop/src/components/contact/ContactModel.cpp rename to linphone-app/src/components/contact/ContactModel.cpp diff --git a/linphone-desktop/src/components/contact/ContactModel.hpp b/linphone-app/src/components/contact/ContactModel.hpp similarity index 100% rename from linphone-desktop/src/components/contact/ContactModel.hpp rename to linphone-app/src/components/contact/ContactModel.hpp diff --git a/linphone-desktop/src/components/contact/VcardModel.cpp b/linphone-app/src/components/contact/VcardModel.cpp similarity index 100% rename from linphone-desktop/src/components/contact/VcardModel.cpp rename to linphone-app/src/components/contact/VcardModel.cpp diff --git a/linphone-desktop/src/components/contact/VcardModel.hpp b/linphone-app/src/components/contact/VcardModel.hpp similarity index 100% rename from linphone-desktop/src/components/contact/VcardModel.hpp rename to linphone-app/src/components/contact/VcardModel.hpp diff --git a/linphone-desktop/src/components/contacts/ContactsListModel.cpp b/linphone-app/src/components/contacts/ContactsListModel.cpp similarity index 100% rename from linphone-desktop/src/components/contacts/ContactsListModel.cpp rename to linphone-app/src/components/contacts/ContactsListModel.cpp diff --git a/linphone-desktop/src/components/contacts/ContactsListModel.hpp b/linphone-app/src/components/contacts/ContactsListModel.hpp similarity index 100% rename from linphone-desktop/src/components/contacts/ContactsListModel.hpp rename to linphone-app/src/components/contacts/ContactsListModel.hpp diff --git a/linphone-desktop/src/components/contacts/ContactsListProxyModel.cpp b/linphone-app/src/components/contacts/ContactsListProxyModel.cpp similarity index 100% rename from linphone-desktop/src/components/contacts/ContactsListProxyModel.cpp rename to linphone-app/src/components/contacts/ContactsListProxyModel.cpp diff --git a/linphone-desktop/src/components/contacts/ContactsListProxyModel.hpp b/linphone-app/src/components/contacts/ContactsListProxyModel.hpp similarity index 100% rename from linphone-desktop/src/components/contacts/ContactsListProxyModel.hpp rename to linphone-app/src/components/contacts/ContactsListProxyModel.hpp diff --git a/linphone-desktop/src/components/core/CoreHandlers.cpp b/linphone-app/src/components/core/CoreHandlers.cpp similarity index 100% rename from linphone-desktop/src/components/core/CoreHandlers.cpp rename to linphone-app/src/components/core/CoreHandlers.cpp diff --git a/linphone-desktop/src/components/core/CoreHandlers.hpp b/linphone-app/src/components/core/CoreHandlers.hpp similarity index 100% rename from linphone-desktop/src/components/core/CoreHandlers.hpp rename to linphone-app/src/components/core/CoreHandlers.hpp diff --git a/linphone-desktop/src/components/core/CoreManager.cpp b/linphone-app/src/components/core/CoreManager.cpp similarity index 100% rename from linphone-desktop/src/components/core/CoreManager.cpp rename to linphone-app/src/components/core/CoreManager.cpp diff --git a/linphone-desktop/src/components/core/CoreManager.hpp b/linphone-app/src/components/core/CoreManager.hpp similarity index 100% rename from linphone-desktop/src/components/core/CoreManager.hpp rename to linphone-app/src/components/core/CoreManager.hpp diff --git a/linphone-desktop/src/components/core/event-count-notifier/AbstractEventCountNotifier.cpp b/linphone-app/src/components/core/event-count-notifier/AbstractEventCountNotifier.cpp similarity index 100% rename from linphone-desktop/src/components/core/event-count-notifier/AbstractEventCountNotifier.cpp rename to linphone-app/src/components/core/event-count-notifier/AbstractEventCountNotifier.cpp diff --git a/linphone-desktop/src/components/core/event-count-notifier/AbstractEventCountNotifier.hpp b/linphone-app/src/components/core/event-count-notifier/AbstractEventCountNotifier.hpp similarity index 100% rename from linphone-desktop/src/components/core/event-count-notifier/AbstractEventCountNotifier.hpp rename to linphone-app/src/components/core/event-count-notifier/AbstractEventCountNotifier.hpp diff --git a/linphone-desktop/src/components/core/event-count-notifier/EventCountNotifierMacOs.hpp b/linphone-app/src/components/core/event-count-notifier/EventCountNotifierMacOs.hpp similarity index 100% rename from linphone-desktop/src/components/core/event-count-notifier/EventCountNotifierMacOs.hpp rename to linphone-app/src/components/core/event-count-notifier/EventCountNotifierMacOs.hpp diff --git a/linphone-desktop/src/components/core/event-count-notifier/EventCountNotifierMacOs.m b/linphone-app/src/components/core/event-count-notifier/EventCountNotifierMacOs.m similarity index 100% rename from linphone-desktop/src/components/core/event-count-notifier/EventCountNotifierMacOs.m rename to linphone-app/src/components/core/event-count-notifier/EventCountNotifierMacOs.m diff --git a/linphone-desktop/src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.cpp b/linphone-app/src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.cpp similarity index 100% rename from linphone-desktop/src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.cpp rename to linphone-app/src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.cpp diff --git a/linphone-desktop/src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.hpp b/linphone-app/src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.hpp similarity index 100% rename from linphone-desktop/src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.hpp rename to linphone-app/src/components/core/event-count-notifier/EventCountNotifierSystemTrayIcon.hpp diff --git a/linphone-desktop/src/components/file/FileDownloader.cpp b/linphone-app/src/components/file/FileDownloader.cpp similarity index 100% rename from linphone-desktop/src/components/file/FileDownloader.cpp rename to linphone-app/src/components/file/FileDownloader.cpp diff --git a/linphone-desktop/src/components/file/FileDownloader.hpp b/linphone-app/src/components/file/FileDownloader.hpp similarity index 100% rename from linphone-desktop/src/components/file/FileDownloader.hpp rename to linphone-app/src/components/file/FileDownloader.hpp diff --git a/linphone-desktop/src/components/file/FileExtractor.cpp b/linphone-app/src/components/file/FileExtractor.cpp similarity index 100% rename from linphone-desktop/src/components/file/FileExtractor.cpp rename to linphone-app/src/components/file/FileExtractor.cpp diff --git a/linphone-desktop/src/components/file/FileExtractor.hpp b/linphone-app/src/components/file/FileExtractor.hpp similarity index 100% rename from linphone-desktop/src/components/file/FileExtractor.hpp rename to linphone-app/src/components/file/FileExtractor.hpp diff --git a/linphone-desktop/src/components/notifier/Notifier.cpp b/linphone-app/src/components/notifier/Notifier.cpp similarity index 100% rename from linphone-desktop/src/components/notifier/Notifier.cpp rename to linphone-app/src/components/notifier/Notifier.cpp diff --git a/linphone-desktop/src/components/notifier/Notifier.hpp b/linphone-app/src/components/notifier/Notifier.hpp similarity index 100% rename from linphone-desktop/src/components/notifier/Notifier.hpp rename to linphone-app/src/components/notifier/Notifier.hpp diff --git a/linphone-desktop/src/components/other/clipboard/Clipboard.cpp b/linphone-app/src/components/other/clipboard/Clipboard.cpp similarity index 100% rename from linphone-desktop/src/components/other/clipboard/Clipboard.cpp rename to linphone-app/src/components/other/clipboard/Clipboard.cpp diff --git a/linphone-desktop/src/components/other/clipboard/Clipboard.hpp b/linphone-app/src/components/other/clipboard/Clipboard.hpp similarity index 100% rename from linphone-desktop/src/components/other/clipboard/Clipboard.hpp rename to linphone-app/src/components/other/clipboard/Clipboard.hpp diff --git a/linphone-desktop/src/components/other/colors/Colors.cpp b/linphone-app/src/components/other/colors/Colors.cpp similarity index 100% rename from linphone-desktop/src/components/other/colors/Colors.cpp rename to linphone-app/src/components/other/colors/Colors.cpp diff --git a/linphone-desktop/src/components/other/colors/Colors.hpp b/linphone-app/src/components/other/colors/Colors.hpp similarity index 100% rename from linphone-desktop/src/components/other/colors/Colors.hpp rename to linphone-app/src/components/other/colors/Colors.hpp diff --git a/linphone-desktop/src/components/other/desktop-tools/DesktopTools.hpp b/linphone-app/src/components/other/desktop-tools/DesktopTools.hpp similarity index 100% rename from linphone-desktop/src/components/other/desktop-tools/DesktopTools.hpp rename to linphone-app/src/components/other/desktop-tools/DesktopTools.hpp diff --git a/linphone-desktop/src/components/other/desktop-tools/DesktopToolsLinux.cpp b/linphone-app/src/components/other/desktop-tools/DesktopToolsLinux.cpp similarity index 100% rename from linphone-desktop/src/components/other/desktop-tools/DesktopToolsLinux.cpp rename to linphone-app/src/components/other/desktop-tools/DesktopToolsLinux.cpp diff --git a/linphone-desktop/src/components/other/desktop-tools/DesktopToolsLinux.hpp b/linphone-app/src/components/other/desktop-tools/DesktopToolsLinux.hpp similarity index 100% rename from linphone-desktop/src/components/other/desktop-tools/DesktopToolsLinux.hpp rename to linphone-app/src/components/other/desktop-tools/DesktopToolsLinux.hpp diff --git a/linphone-desktop/src/components/other/desktop-tools/DesktopToolsMacOs.cpp b/linphone-app/src/components/other/desktop-tools/DesktopToolsMacOs.cpp similarity index 100% rename from linphone-desktop/src/components/other/desktop-tools/DesktopToolsMacOs.cpp rename to linphone-app/src/components/other/desktop-tools/DesktopToolsMacOs.cpp diff --git a/linphone-desktop/src/components/other/desktop-tools/DesktopToolsMacOs.hpp b/linphone-app/src/components/other/desktop-tools/DesktopToolsMacOs.hpp similarity index 100% rename from linphone-desktop/src/components/other/desktop-tools/DesktopToolsMacOs.hpp rename to linphone-app/src/components/other/desktop-tools/DesktopToolsMacOs.hpp diff --git a/linphone-desktop/src/components/other/desktop-tools/DesktopToolsWindows.cpp b/linphone-app/src/components/other/desktop-tools/DesktopToolsWindows.cpp similarity index 100% rename from linphone-desktop/src/components/other/desktop-tools/DesktopToolsWindows.cpp rename to linphone-app/src/components/other/desktop-tools/DesktopToolsWindows.cpp diff --git a/linphone-desktop/src/components/other/desktop-tools/DesktopToolsWindows.hpp b/linphone-app/src/components/other/desktop-tools/DesktopToolsWindows.hpp similarity index 100% rename from linphone-desktop/src/components/other/desktop-tools/DesktopToolsWindows.hpp rename to linphone-app/src/components/other/desktop-tools/DesktopToolsWindows.hpp diff --git a/linphone-desktop/src/components/other/desktop-tools/screen-saver/ScreenSaverDBus.cpp b/linphone-app/src/components/other/desktop-tools/screen-saver/ScreenSaverDBus.cpp similarity index 100% rename from linphone-desktop/src/components/other/desktop-tools/screen-saver/ScreenSaverDBus.cpp rename to linphone-app/src/components/other/desktop-tools/screen-saver/ScreenSaverDBus.cpp diff --git a/linphone-desktop/src/components/other/desktop-tools/screen-saver/ScreenSaverDBus.hpp b/linphone-app/src/components/other/desktop-tools/screen-saver/ScreenSaverDBus.hpp similarity index 100% rename from linphone-desktop/src/components/other/desktop-tools/screen-saver/ScreenSaverDBus.hpp rename to linphone-app/src/components/other/desktop-tools/screen-saver/ScreenSaverDBus.hpp diff --git a/linphone-desktop/src/components/other/desktop-tools/screen-saver/ScreenSaverMacOs.m b/linphone-app/src/components/other/desktop-tools/screen-saver/ScreenSaverMacOs.m similarity index 100% rename from linphone-desktop/src/components/other/desktop-tools/screen-saver/ScreenSaverMacOs.m rename to linphone-app/src/components/other/desktop-tools/screen-saver/ScreenSaverMacOs.m diff --git a/linphone-desktop/src/components/other/desktop-tools/screen-saver/ScreenSaverXdg.cpp b/linphone-app/src/components/other/desktop-tools/screen-saver/ScreenSaverXdg.cpp similarity index 100% rename from linphone-desktop/src/components/other/desktop-tools/screen-saver/ScreenSaverXdg.cpp rename to linphone-app/src/components/other/desktop-tools/screen-saver/ScreenSaverXdg.cpp diff --git a/linphone-desktop/src/components/other/desktop-tools/screen-saver/ScreenSaverXdg.hpp b/linphone-app/src/components/other/desktop-tools/screen-saver/ScreenSaverXdg.hpp similarity index 100% rename from linphone-desktop/src/components/other/desktop-tools/screen-saver/ScreenSaverXdg.hpp rename to linphone-app/src/components/other/desktop-tools/screen-saver/ScreenSaverXdg.hpp diff --git a/linphone-desktop/src/components/other/desktop-tools/state-process/StateProcessMacOs.mm b/linphone-app/src/components/other/desktop-tools/state-process/StateProcessMacOs.mm similarity index 100% rename from linphone-desktop/src/components/other/desktop-tools/state-process/StateProcessMacOs.mm rename to linphone-app/src/components/other/desktop-tools/state-process/StateProcessMacOs.mm diff --git a/linphone-desktop/src/components/other/text-to-speech/TextToSpeech.cpp b/linphone-app/src/components/other/text-to-speech/TextToSpeech.cpp similarity index 100% rename from linphone-desktop/src/components/other/text-to-speech/TextToSpeech.cpp rename to linphone-app/src/components/other/text-to-speech/TextToSpeech.cpp diff --git a/linphone-desktop/src/components/other/text-to-speech/TextToSpeech.hpp b/linphone-app/src/components/other/text-to-speech/TextToSpeech.hpp similarity index 100% rename from linphone-desktop/src/components/other/text-to-speech/TextToSpeech.hpp rename to linphone-app/src/components/other/text-to-speech/TextToSpeech.hpp diff --git a/linphone-desktop/src/components/other/units/Units.cpp b/linphone-app/src/components/other/units/Units.cpp similarity index 100% rename from linphone-desktop/src/components/other/units/Units.cpp rename to linphone-app/src/components/other/units/Units.cpp diff --git a/linphone-desktop/src/components/other/units/Units.hpp b/linphone-app/src/components/other/units/Units.hpp similarity index 100% rename from linphone-desktop/src/components/other/units/Units.hpp rename to linphone-app/src/components/other/units/Units.hpp diff --git a/linphone-desktop/src/components/presence/OwnPresenceModel.cpp b/linphone-app/src/components/presence/OwnPresenceModel.cpp similarity index 100% rename from linphone-desktop/src/components/presence/OwnPresenceModel.cpp rename to linphone-app/src/components/presence/OwnPresenceModel.cpp diff --git a/linphone-desktop/src/components/presence/OwnPresenceModel.hpp b/linphone-app/src/components/presence/OwnPresenceModel.hpp similarity index 100% rename from linphone-desktop/src/components/presence/OwnPresenceModel.hpp rename to linphone-app/src/components/presence/OwnPresenceModel.hpp diff --git a/linphone-desktop/src/components/presence/Presence.cpp b/linphone-app/src/components/presence/Presence.cpp similarity index 100% rename from linphone-desktop/src/components/presence/Presence.cpp rename to linphone-app/src/components/presence/Presence.cpp diff --git a/linphone-desktop/src/components/presence/Presence.hpp b/linphone-app/src/components/presence/Presence.hpp similarity index 100% rename from linphone-desktop/src/components/presence/Presence.hpp rename to linphone-app/src/components/presence/Presence.hpp diff --git a/linphone-desktop/src/components/settings/AccountSettingsModel.cpp b/linphone-app/src/components/settings/AccountSettingsModel.cpp similarity index 100% rename from linphone-desktop/src/components/settings/AccountSettingsModel.cpp rename to linphone-app/src/components/settings/AccountSettingsModel.cpp diff --git a/linphone-desktop/src/components/settings/AccountSettingsModel.hpp b/linphone-app/src/components/settings/AccountSettingsModel.hpp similarity index 100% rename from linphone-desktop/src/components/settings/AccountSettingsModel.hpp rename to linphone-app/src/components/settings/AccountSettingsModel.hpp diff --git a/linphone-desktop/src/components/settings/SettingsModel.cpp b/linphone-app/src/components/settings/SettingsModel.cpp similarity index 100% rename from linphone-desktop/src/components/settings/SettingsModel.cpp rename to linphone-app/src/components/settings/SettingsModel.cpp diff --git a/linphone-desktop/src/components/settings/SettingsModel.hpp b/linphone-app/src/components/settings/SettingsModel.hpp similarity index 100% rename from linphone-desktop/src/components/settings/SettingsModel.hpp rename to linphone-app/src/components/settings/SettingsModel.hpp diff --git a/linphone-desktop/src/components/sip-addresses/SipAddressObserver.cpp b/linphone-app/src/components/sip-addresses/SipAddressObserver.cpp similarity index 100% rename from linphone-desktop/src/components/sip-addresses/SipAddressObserver.cpp rename to linphone-app/src/components/sip-addresses/SipAddressObserver.cpp diff --git a/linphone-desktop/src/components/sip-addresses/SipAddressObserver.hpp b/linphone-app/src/components/sip-addresses/SipAddressObserver.hpp similarity index 100% rename from linphone-desktop/src/components/sip-addresses/SipAddressObserver.hpp rename to linphone-app/src/components/sip-addresses/SipAddressObserver.hpp diff --git a/linphone-desktop/src/components/sip-addresses/SipAddressesModel.cpp b/linphone-app/src/components/sip-addresses/SipAddressesModel.cpp similarity index 100% rename from linphone-desktop/src/components/sip-addresses/SipAddressesModel.cpp rename to linphone-app/src/components/sip-addresses/SipAddressesModel.cpp diff --git a/linphone-desktop/src/components/sip-addresses/SipAddressesModel.hpp b/linphone-app/src/components/sip-addresses/SipAddressesModel.hpp similarity index 100% rename from linphone-desktop/src/components/sip-addresses/SipAddressesModel.hpp rename to linphone-app/src/components/sip-addresses/SipAddressesModel.hpp diff --git a/linphone-desktop/src/components/sip-addresses/SipAddressesProxyModel.cpp b/linphone-app/src/components/sip-addresses/SipAddressesProxyModel.cpp similarity index 100% rename from linphone-desktop/src/components/sip-addresses/SipAddressesProxyModel.cpp rename to linphone-app/src/components/sip-addresses/SipAddressesProxyModel.cpp diff --git a/linphone-desktop/src/components/sip-addresses/SipAddressesProxyModel.hpp b/linphone-app/src/components/sip-addresses/SipAddressesProxyModel.hpp similarity index 100% rename from linphone-desktop/src/components/sip-addresses/SipAddressesProxyModel.hpp rename to linphone-app/src/components/sip-addresses/SipAddressesProxyModel.hpp diff --git a/linphone-desktop/src/components/sound-player/SoundPlayer.cpp b/linphone-app/src/components/sound-player/SoundPlayer.cpp similarity index 100% rename from linphone-desktop/src/components/sound-player/SoundPlayer.cpp rename to linphone-app/src/components/sound-player/SoundPlayer.cpp diff --git a/linphone-desktop/src/components/sound-player/SoundPlayer.hpp b/linphone-app/src/components/sound-player/SoundPlayer.hpp similarity index 100% rename from linphone-desktop/src/components/sound-player/SoundPlayer.hpp rename to linphone-app/src/components/sound-player/SoundPlayer.hpp diff --git a/linphone-desktop/src/components/telephone-numbers/TelephoneNumbersModel.cpp b/linphone-app/src/components/telephone-numbers/TelephoneNumbersModel.cpp similarity index 100% rename from linphone-desktop/src/components/telephone-numbers/TelephoneNumbersModel.cpp rename to linphone-app/src/components/telephone-numbers/TelephoneNumbersModel.cpp diff --git a/linphone-desktop/src/components/telephone-numbers/TelephoneNumbersModel.hpp b/linphone-app/src/components/telephone-numbers/TelephoneNumbersModel.hpp similarity index 100% rename from linphone-desktop/src/components/telephone-numbers/TelephoneNumbersModel.hpp rename to linphone-app/src/components/telephone-numbers/TelephoneNumbersModel.hpp diff --git a/linphone-desktop/src/components/timeline/TimelineModel.cpp b/linphone-app/src/components/timeline/TimelineModel.cpp similarity index 100% rename from linphone-desktop/src/components/timeline/TimelineModel.cpp rename to linphone-app/src/components/timeline/TimelineModel.cpp diff --git a/linphone-desktop/src/components/timeline/TimelineModel.hpp b/linphone-app/src/components/timeline/TimelineModel.hpp similarity index 100% rename from linphone-desktop/src/components/timeline/TimelineModel.hpp rename to linphone-app/src/components/timeline/TimelineModel.hpp diff --git a/linphone-desktop/src/components/url-handlers/UrlHandlers.cpp b/linphone-app/src/components/url-handlers/UrlHandlers.cpp similarity index 100% rename from linphone-desktop/src/components/url-handlers/UrlHandlers.cpp rename to linphone-app/src/components/url-handlers/UrlHandlers.cpp diff --git a/linphone-desktop/src/components/url-handlers/UrlHandlers.hpp b/linphone-app/src/components/url-handlers/UrlHandlers.hpp similarity index 100% rename from linphone-desktop/src/components/url-handlers/UrlHandlers.hpp rename to linphone-app/src/components/url-handlers/UrlHandlers.hpp diff --git a/linphone-desktop/src/config.h.cmake b/linphone-app/src/config.h.cmake similarity index 100% rename from linphone-desktop/src/config.h.cmake rename to linphone-app/src/config.h.cmake diff --git a/linphone-desktop/src/utils/LinphoneUtils.cpp b/linphone-app/src/utils/LinphoneUtils.cpp similarity index 100% rename from linphone-desktop/src/utils/LinphoneUtils.cpp rename to linphone-app/src/utils/LinphoneUtils.cpp diff --git a/linphone-desktop/src/utils/LinphoneUtils.hpp b/linphone-app/src/utils/LinphoneUtils.hpp similarity index 100% rename from linphone-desktop/src/utils/LinphoneUtils.hpp rename to linphone-app/src/utils/LinphoneUtils.hpp diff --git a/linphone-desktop/src/utils/MediastreamerUtils.cpp b/linphone-app/src/utils/MediastreamerUtils.cpp similarity index 100% rename from linphone-desktop/src/utils/MediastreamerUtils.cpp rename to linphone-app/src/utils/MediastreamerUtils.cpp diff --git a/linphone-desktop/src/utils/MediastreamerUtils.hpp b/linphone-app/src/utils/MediastreamerUtils.hpp similarity index 100% rename from linphone-desktop/src/utils/MediastreamerUtils.hpp rename to linphone-app/src/utils/MediastreamerUtils.hpp diff --git a/linphone-desktop/src/utils/QExifImageHeader.cpp b/linphone-app/src/utils/QExifImageHeader.cpp similarity index 100% rename from linphone-desktop/src/utils/QExifImageHeader.cpp rename to linphone-app/src/utils/QExifImageHeader.cpp diff --git a/linphone-desktop/src/utils/QExifImageHeader.hpp b/linphone-app/src/utils/QExifImageHeader.hpp similarity index 100% rename from linphone-desktop/src/utils/QExifImageHeader.hpp rename to linphone-app/src/utils/QExifImageHeader.hpp diff --git a/linphone-desktop/src/utils/Utils.cpp b/linphone-app/src/utils/Utils.cpp similarity index 100% rename from linphone-desktop/src/utils/Utils.cpp rename to linphone-app/src/utils/Utils.cpp diff --git a/linphone-desktop/src/utils/Utils.hpp b/linphone-app/src/utils/Utils.hpp similarity index 100% rename from linphone-desktop/src/utils/Utils.hpp rename to linphone-app/src/utils/Utils.hpp diff --git a/linphone-desktop/ui/dev-modules/Colors/Colors.qml b/linphone-app/ui/dev-modules/Colors/Colors.qml similarity index 100% rename from linphone-desktop/ui/dev-modules/Colors/Colors.qml rename to linphone-app/ui/dev-modules/Colors/Colors.qml diff --git a/linphone-desktop/ui/dev-modules/Colors/qmldir b/linphone-app/ui/dev-modules/Colors/qmldir similarity index 100% rename from linphone-desktop/ui/dev-modules/Colors/qmldir rename to linphone-app/ui/dev-modules/Colors/qmldir diff --git a/linphone-desktop/ui/dev-modules/Units/Units.qml b/linphone-app/ui/dev-modules/Units/Units.qml similarity index 100% rename from linphone-desktop/ui/dev-modules/Units/Units.qml rename to linphone-app/ui/dev-modules/Units/Units.qml diff --git a/linphone-desktop/ui/dev-modules/Units/qmldir b/linphone-app/ui/dev-modules/Units/qmldir similarity index 100% rename from linphone-desktop/ui/dev-modules/Units/qmldir rename to linphone-app/ui/dev-modules/Units/qmldir diff --git a/linphone-desktop/ui/modules/Common/Animations/BusyIndicator.qml b/linphone-app/ui/modules/Common/Animations/BusyIndicator.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Animations/BusyIndicator.qml rename to linphone-app/ui/modules/Common/Animations/BusyIndicator.qml diff --git a/linphone-desktop/ui/modules/Common/Constants/Constants.qml b/linphone-app/ui/modules/Common/Constants/Constants.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Constants/Constants.qml rename to linphone-app/ui/modules/Common/Constants/Constants.qml diff --git a/linphone-desktop/ui/modules/Common/Dialog/ConfirmDialog.qml b/linphone-app/ui/modules/Common/Dialog/ConfirmDialog.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Dialog/ConfirmDialog.qml rename to linphone-app/ui/modules/Common/Dialog/ConfirmDialog.qml diff --git a/linphone-desktop/ui/modules/Common/Dialog/DialogDescription.qml b/linphone-app/ui/modules/Common/Dialog/DialogDescription.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Dialog/DialogDescription.qml rename to linphone-app/ui/modules/Common/Dialog/DialogDescription.qml diff --git a/linphone-desktop/ui/modules/Common/Dialog/DialogPlus.qml b/linphone-app/ui/modules/Common/Dialog/DialogPlus.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Dialog/DialogPlus.qml rename to linphone-app/ui/modules/Common/Dialog/DialogPlus.qml diff --git a/linphone-desktop/ui/modules/Common/Form/ActionBar.qml b/linphone-app/ui/modules/Common/Form/ActionBar.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/ActionBar.qml rename to linphone-app/ui/modules/Common/Form/ActionBar.qml diff --git a/linphone-desktop/ui/modules/Common/Form/ActionButton.qml b/linphone-app/ui/modules/Common/Form/ActionButton.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/ActionButton.qml rename to linphone-app/ui/modules/Common/Form/ActionButton.qml diff --git a/linphone-desktop/ui/modules/Common/Form/ActionSwitch.qml b/linphone-app/ui/modules/Common/Form/ActionSwitch.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/ActionSwitch.qml rename to linphone-app/ui/modules/Common/Form/ActionSwitch.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Buttons/AbstractTextButton.qml b/linphone-app/ui/modules/Common/Form/Buttons/AbstractTextButton.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Buttons/AbstractTextButton.qml rename to linphone-app/ui/modules/Common/Form/Buttons/AbstractTextButton.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Buttons/ExclusiveButtons.qml b/linphone-app/ui/modules/Common/Form/Buttons/ExclusiveButtons.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Buttons/ExclusiveButtons.qml rename to linphone-app/ui/modules/Common/Form/Buttons/ExclusiveButtons.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Buttons/ExclusiveButtons.spec.qml b/linphone-app/ui/modules/Common/Form/Buttons/ExclusiveButtons.spec.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Buttons/ExclusiveButtons.spec.qml rename to linphone-app/ui/modules/Common/Form/Buttons/ExclusiveButtons.spec.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Buttons/FileChooserButton.qml b/linphone-app/ui/modules/Common/Form/Buttons/FileChooserButton.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Buttons/FileChooserButton.qml rename to linphone-app/ui/modules/Common/Form/Buttons/FileChooserButton.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Buttons/SmallButton.qml b/linphone-app/ui/modules/Common/Form/Buttons/SmallButton.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Buttons/SmallButton.qml rename to linphone-app/ui/modules/Common/Form/Buttons/SmallButton.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Buttons/TextButtonA.qml b/linphone-app/ui/modules/Common/Form/Buttons/TextButtonA.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Buttons/TextButtonA.qml rename to linphone-app/ui/modules/Common/Form/Buttons/TextButtonA.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Buttons/TextButtonB.qml b/linphone-app/ui/modules/Common/Form/Buttons/TextButtonB.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Buttons/TextButtonB.qml rename to linphone-app/ui/modules/Common/Form/Buttons/TextButtonB.qml diff --git a/linphone-desktop/ui/modules/Common/Form/CheckBoxText.qml b/linphone-app/ui/modules/Common/Form/CheckBoxText.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/CheckBoxText.qml rename to linphone-app/ui/modules/Common/Form/CheckBoxText.qml diff --git a/linphone-desktop/ui/modules/Common/Form/ComboBox.js b/linphone-app/ui/modules/Common/Form/ComboBox.js similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/ComboBox.js rename to linphone-app/ui/modules/Common/Form/ComboBox.js diff --git a/linphone-desktop/ui/modules/Common/Form/ComboBox.qml b/linphone-app/ui/modules/Common/Form/ComboBox.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/ComboBox.qml rename to linphone-app/ui/modules/Common/Form/ComboBox.qml diff --git a/linphone-desktop/ui/modules/Common/Form/CommonItemDelegate.qml b/linphone-app/ui/modules/Common/Form/CommonItemDelegate.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/CommonItemDelegate.qml rename to linphone-app/ui/modules/Common/Form/CommonItemDelegate.qml diff --git a/linphone-desktop/ui/modules/Common/Form/DroppableTextArea.qml b/linphone-app/ui/modules/Common/Form/DroppableTextArea.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/DroppableTextArea.qml rename to linphone-app/ui/modules/Common/Form/DroppableTextArea.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Fields/HexField.qml b/linphone-app/ui/modules/Common/Form/Fields/HexField.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Fields/HexField.qml rename to linphone-app/ui/modules/Common/Form/Fields/HexField.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Fields/NumericField.qml b/linphone-app/ui/modules/Common/Form/Fields/NumericField.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Fields/NumericField.qml rename to linphone-app/ui/modules/Common/Form/Fields/NumericField.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Fields/PasswordField.qml b/linphone-app/ui/modules/Common/Form/Fields/PasswordField.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Fields/PasswordField.qml rename to linphone-app/ui/modules/Common/Form/Fields/PasswordField.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Fields/PortField.qml b/linphone-app/ui/modules/Common/Form/Fields/PortField.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Fields/PortField.qml rename to linphone-app/ui/modules/Common/Form/Fields/PortField.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Fields/ScrollableListViewField.qml b/linphone-app/ui/modules/Common/Form/Fields/ScrollableListViewField.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Fields/ScrollableListViewField.qml rename to linphone-app/ui/modules/Common/Form/Fields/ScrollableListViewField.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Fields/TextAreaField.qml b/linphone-app/ui/modules/Common/Form/Fields/TextAreaField.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Fields/TextAreaField.qml rename to linphone-app/ui/modules/Common/Form/Fields/TextAreaField.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Fields/TextField.qml b/linphone-app/ui/modules/Common/Form/Fields/TextField.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Fields/TextField.qml rename to linphone-app/ui/modules/Common/Form/Fields/TextField.qml diff --git a/linphone-desktop/ui/modules/Common/Form/ListForm.js b/linphone-app/ui/modules/Common/Form/ListForm.js similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/ListForm.js rename to linphone-app/ui/modules/Common/Form/ListForm.js diff --git a/linphone-desktop/ui/modules/Common/Form/ListForm.qml b/linphone-app/ui/modules/Common/Form/ListForm.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/ListForm.qml rename to linphone-app/ui/modules/Common/Form/ListForm.qml diff --git a/linphone-desktop/ui/modules/Common/Form/ListItemSelector.js b/linphone-app/ui/modules/Common/Form/ListItemSelector.js similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/ListItemSelector.js rename to linphone-app/ui/modules/Common/Form/ListItemSelector.js diff --git a/linphone-desktop/ui/modules/Common/Form/ListItemSelector.qml b/linphone-app/ui/modules/Common/Form/ListItemSelector.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/ListItemSelector.qml rename to linphone-app/ui/modules/Common/Form/ListItemSelector.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Placements/Form.qml b/linphone-app/ui/modules/Common/Form/Placements/Form.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Placements/Form.qml rename to linphone-app/ui/modules/Common/Form/Placements/Form.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Placements/FormEmptyLine.qml b/linphone-app/ui/modules/Common/Form/Placements/FormEmptyLine.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Placements/FormEmptyLine.qml rename to linphone-app/ui/modules/Common/Form/Placements/FormEmptyLine.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Placements/FormGroup.qml b/linphone-app/ui/modules/Common/Form/Placements/FormGroup.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Placements/FormGroup.qml rename to linphone-app/ui/modules/Common/Form/Placements/FormGroup.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Placements/FormHGroup.qml b/linphone-app/ui/modules/Common/Form/Placements/FormHGroup.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Placements/FormHGroup.qml rename to linphone-app/ui/modules/Common/Form/Placements/FormHGroup.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Placements/FormLine.qml b/linphone-app/ui/modules/Common/Form/Placements/FormLine.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Placements/FormLine.qml rename to linphone-app/ui/modules/Common/Form/Placements/FormLine.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Placements/FormTable.qml b/linphone-app/ui/modules/Common/Form/Placements/FormTable.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Placements/FormTable.qml rename to linphone-app/ui/modules/Common/Form/Placements/FormTable.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Placements/FormTableEntry.qml b/linphone-app/ui/modules/Common/Form/Placements/FormTableEntry.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Placements/FormTableEntry.qml rename to linphone-app/ui/modules/Common/Form/Placements/FormTableEntry.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Placements/FormTableLine.qml b/linphone-app/ui/modules/Common/Form/Placements/FormTableLine.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Placements/FormTableLine.qml rename to linphone-app/ui/modules/Common/Form/Placements/FormTableLine.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Placements/FormVGroup.qml b/linphone-app/ui/modules/Common/Form/Placements/FormVGroup.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Placements/FormVGroup.qml rename to linphone-app/ui/modules/Common/Form/Placements/FormVGroup.qml diff --git a/linphone-desktop/ui/modules/Common/Form/SearchBox.qml b/linphone-app/ui/modules/Common/Form/SearchBox.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/SearchBox.qml rename to linphone-app/ui/modules/Common/Form/SearchBox.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Slider.qml b/linphone-app/ui/modules/Common/Form/Slider.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Slider.qml rename to linphone-app/ui/modules/Common/Form/Slider.qml diff --git a/linphone-desktop/ui/modules/Common/Form/StaticListForm.qml b/linphone-app/ui/modules/Common/Form/StaticListForm.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/StaticListForm.qml rename to linphone-app/ui/modules/Common/Form/StaticListForm.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Switch.qml b/linphone-app/ui/modules/Common/Form/Switch.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Switch.qml rename to linphone-app/ui/modules/Common/Form/Switch.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Tab/TabBar.qml b/linphone-app/ui/modules/Common/Form/Tab/TabBar.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Tab/TabBar.qml rename to linphone-app/ui/modules/Common/Form/Tab/TabBar.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Tab/TabButton.qml b/linphone-app/ui/modules/Common/Form/Tab/TabButton.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Tab/TabButton.qml rename to linphone-app/ui/modules/Common/Form/Tab/TabButton.qml diff --git a/linphone-desktop/ui/modules/Common/Form/Tab/TabContainer.qml b/linphone-app/ui/modules/Common/Form/Tab/TabContainer.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/Tab/TabContainer.qml rename to linphone-app/ui/modules/Common/Form/Tab/TabContainer.qml diff --git a/linphone-desktop/ui/modules/Common/Form/TransparentTextInput.qml b/linphone-app/ui/modules/Common/Form/TransparentTextInput.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Form/TransparentTextInput.qml rename to linphone-app/ui/modules/Common/Form/TransparentTextInput.qml diff --git a/linphone-desktop/ui/modules/Common/Helpers/DragBox.qml b/linphone-app/ui/modules/Common/Helpers/DragBox.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Helpers/DragBox.qml rename to linphone-app/ui/modules/Common/Helpers/DragBox.qml diff --git a/linphone-desktop/ui/modules/Common/Helpers/InvertedMouseArea.qml b/linphone-app/ui/modules/Common/Helpers/InvertedMouseArea.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Helpers/InvertedMouseArea.qml rename to linphone-app/ui/modules/Common/Helpers/InvertedMouseArea.qml diff --git a/linphone-desktop/ui/modules/Common/Helpers/InvertedMouseArea.spec.qml b/linphone-app/ui/modules/Common/Helpers/InvertedMouseArea.spec.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Helpers/InvertedMouseArea.spec.qml rename to linphone-app/ui/modules/Common/Helpers/InvertedMouseArea.spec.qml diff --git a/linphone-desktop/ui/modules/Common/Image/Icon.qml b/linphone-app/ui/modules/Common/Image/Icon.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Image/Icon.qml rename to linphone-app/ui/modules/Common/Image/Icon.qml diff --git a/linphone-desktop/ui/modules/Common/Image/RoundedImage.qml b/linphone-app/ui/modules/Common/Image/RoundedImage.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Image/RoundedImage.qml rename to linphone-app/ui/modules/Common/Image/RoundedImage.qml diff --git a/linphone-desktop/ui/modules/Common/Indicators/VuMeter.qml b/linphone-app/ui/modules/Common/Indicators/VuMeter.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Indicators/VuMeter.qml rename to linphone-app/ui/modules/Common/Indicators/VuMeter.qml diff --git a/linphone-desktop/ui/modules/Common/Menus/ApplicationMenu.qml b/linphone-app/ui/modules/Common/Menus/ApplicationMenu.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Menus/ApplicationMenu.qml rename to linphone-app/ui/modules/Common/Menus/ApplicationMenu.qml diff --git a/linphone-desktop/ui/modules/Common/Menus/ApplicationMenuEntry.qml b/linphone-app/ui/modules/Common/Menus/ApplicationMenuEntry.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Menus/ApplicationMenuEntry.qml rename to linphone-app/ui/modules/Common/Menus/ApplicationMenuEntry.qml diff --git a/linphone-desktop/ui/modules/Common/Menus/DropDownDynamicMenu.qml b/linphone-app/ui/modules/Common/Menus/DropDownDynamicMenu.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Menus/DropDownDynamicMenu.qml rename to linphone-app/ui/modules/Common/Menus/DropDownDynamicMenu.qml diff --git a/linphone-desktop/ui/modules/Common/Menus/DropDownStaticMenu.qml b/linphone-app/ui/modules/Common/Menus/DropDownStaticMenu.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Menus/DropDownStaticMenu.qml rename to linphone-app/ui/modules/Common/Menus/DropDownStaticMenu.qml diff --git a/linphone-desktop/ui/modules/Common/Menus/DropDownStaticMenuEntry.qml b/linphone-app/ui/modules/Common/Menus/DropDownStaticMenuEntry.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Menus/DropDownStaticMenuEntry.qml rename to linphone-app/ui/modules/Common/Menus/DropDownStaticMenuEntry.qml diff --git a/linphone-desktop/ui/modules/Common/Menus/Menu.qml b/linphone-app/ui/modules/Common/Menus/Menu.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Menus/Menu.qml rename to linphone-app/ui/modules/Common/Menus/Menu.qml diff --git a/linphone-desktop/ui/modules/Common/Menus/MenuItem.qml b/linphone-app/ui/modules/Common/Menus/MenuItem.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Menus/MenuItem.qml rename to linphone-app/ui/modules/Common/Menus/MenuItem.qml diff --git a/linphone-desktop/ui/modules/Common/Misc/Borders.qml b/linphone-app/ui/modules/Common/Misc/Borders.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Misc/Borders.qml rename to linphone-app/ui/modules/Common/Misc/Borders.qml diff --git a/linphone-desktop/ui/modules/Common/Misc/ForceScrollBar.qml b/linphone-app/ui/modules/Common/Misc/ForceScrollBar.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Misc/ForceScrollBar.qml rename to linphone-app/ui/modules/Common/Misc/ForceScrollBar.qml diff --git a/linphone-desktop/ui/modules/Common/Misc/Paned.qml b/linphone-app/ui/modules/Common/Misc/Paned.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Misc/Paned.qml rename to linphone-app/ui/modules/Common/Misc/Paned.qml diff --git a/linphone-desktop/ui/modules/Common/Popup/DesktopPopup.qml b/linphone-app/ui/modules/Common/Popup/DesktopPopup.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Popup/DesktopPopup.qml rename to linphone-app/ui/modules/Common/Popup/DesktopPopup.qml diff --git a/linphone-desktop/ui/modules/Common/Popup/Popup.qml b/linphone-app/ui/modules/Common/Popup/Popup.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Popup/Popup.qml rename to linphone-app/ui/modules/Common/Popup/Popup.qml diff --git a/linphone-desktop/ui/modules/Common/Popup/PopupShadow.qml b/linphone-app/ui/modules/Common/Popup/PopupShadow.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Popup/PopupShadow.qml rename to linphone-app/ui/modules/Common/Popup/PopupShadow.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Animations/BusyIndicatorStyle.qml b/linphone-app/ui/modules/Common/Styles/Animations/BusyIndicatorStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Animations/BusyIndicatorStyle.qml rename to linphone-app/ui/modules/Common/Styles/Animations/BusyIndicatorStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Dialog/DialogStyle.qml b/linphone-app/ui/modules/Common/Styles/Dialog/DialogStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Dialog/DialogStyle.qml rename to linphone-app/ui/modules/Common/Styles/Dialog/DialogStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/ActionBarStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/ActionBarStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Form/ActionBarStyle.qml rename to linphone-app/ui/modules/Common/Styles/Form/ActionBarStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/Buttons/AbstractTextButtonStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Buttons/AbstractTextButtonStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Form/Buttons/AbstractTextButtonStyle.qml rename to linphone-app/ui/modules/Common/Styles/Form/Buttons/AbstractTextButtonStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml rename to linphone-app/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/Buttons/FileChooserButtonStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Buttons/FileChooserButtonStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Form/Buttons/FileChooserButtonStyle.qml rename to linphone-app/ui/modules/Common/Styles/Form/Buttons/FileChooserButtonStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml rename to linphone-app/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml rename to linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/Buttons/TextButtonBStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonBStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Form/Buttons/TextButtonBStyle.qml rename to linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonBStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml rename to linphone-app/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/ComboBoxStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/ComboBoxStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Form/ComboBoxStyle.qml rename to linphone-app/ui/modules/Common/Styles/Form/ComboBoxStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/CommonItemDelegateStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/CommonItemDelegateStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Form/CommonItemDelegateStyle.qml rename to linphone-app/ui/modules/Common/Styles/Form/CommonItemDelegateStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/DroppableTextAreaStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/DroppableTextAreaStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Form/DroppableTextAreaStyle.qml rename to linphone-app/ui/modules/Common/Styles/Form/DroppableTextAreaStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml rename to linphone-app/ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/Fields/TextAreaFieldStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Fields/TextAreaFieldStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Form/Fields/TextAreaFieldStyle.qml rename to linphone-app/ui/modules/Common/Styles/Form/Fields/TextAreaFieldStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml rename to linphone-app/ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/ListFormStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/ListFormStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Form/ListFormStyle.qml rename to linphone-app/ui/modules/Common/Styles/Form/ListFormStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormHGroupStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Placements/FormHGroupStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormHGroupStyle.qml rename to linphone-app/ui/modules/Common/Styles/Form/Placements/FormHGroupStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormLineStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Placements/FormLineStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormLineStyle.qml rename to linphone-app/ui/modules/Common/Styles/Form/Placements/FormLineStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Placements/FormStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormStyle.qml rename to linphone-app/ui/modules/Common/Styles/Form/Placements/FormStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormTableLineStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Placements/FormTableLineStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormTableLineStyle.qml rename to linphone-app/ui/modules/Common/Styles/Form/Placements/FormTableLineStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormTableStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Placements/FormTableStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormTableStyle.qml rename to linphone-app/ui/modules/Common/Styles/Form/Placements/FormTableStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormVGroupStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Placements/FormVGroupStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormVGroupStyle.qml rename to linphone-app/ui/modules/Common/Styles/Form/Placements/FormVGroupStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/SearchBoxStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/SearchBoxStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Form/SearchBoxStyle.qml rename to linphone-app/ui/modules/Common/Styles/Form/SearchBoxStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/SliderStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/SliderStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Form/SliderStyle.qml rename to linphone-app/ui/modules/Common/Styles/Form/SliderStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/SwitchStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/SwitchStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Form/SwitchStyle.qml rename to linphone-app/ui/modules/Common/Styles/Form/SwitchStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml rename to linphone-app/ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/Tab/TabContainerStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Tab/TabContainerStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Form/Tab/TabContainerStyle.qml rename to linphone-app/ui/modules/Common/Styles/Form/Tab/TabContainerStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml rename to linphone-app/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Indicators/VuMeterStyle.qml b/linphone-app/ui/modules/Common/Styles/Indicators/VuMeterStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Indicators/VuMeterStyle.qml rename to linphone-app/ui/modules/Common/Styles/Indicators/VuMeterStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml b/linphone-app/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml rename to linphone-app/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Menus/DropDownStaticMenuStyle.qml b/linphone-app/ui/modules/Common/Styles/Menus/DropDownStaticMenuStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Menus/DropDownStaticMenuStyle.qml rename to linphone-app/ui/modules/Common/Styles/Menus/DropDownStaticMenuStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Menus/MenuItemStyle.qml b/linphone-app/ui/modules/Common/Styles/Menus/MenuItemStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Menus/MenuItemStyle.qml rename to linphone-app/ui/modules/Common/Styles/Menus/MenuItemStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Menus/MenuStyle.qml b/linphone-app/ui/modules/Common/Styles/Menus/MenuStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Menus/MenuStyle.qml rename to linphone-app/ui/modules/Common/Styles/Menus/MenuStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Misc/ForceScrollBarStyle.qml b/linphone-app/ui/modules/Common/Styles/Misc/ForceScrollBarStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Misc/ForceScrollBarStyle.qml rename to linphone-app/ui/modules/Common/Styles/Misc/ForceScrollBarStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Misc/PanedStyle.qml b/linphone-app/ui/modules/Common/Styles/Misc/PanedStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Misc/PanedStyle.qml rename to linphone-app/ui/modules/Common/Styles/Misc/PanedStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Popup/PopupStyle.qml b/linphone-app/ui/modules/Common/Styles/Popup/PopupStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Popup/PopupStyle.qml rename to linphone-app/ui/modules/Common/Styles/Popup/PopupStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Tooltip/TooltipStyle.qml b/linphone-app/ui/modules/Common/Styles/Tooltip/TooltipStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Tooltip/TooltipStyle.qml rename to linphone-app/ui/modules/Common/Styles/Tooltip/TooltipStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/Window/WindowStyle.qml b/linphone-app/ui/modules/Common/Styles/Window/WindowStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/Window/WindowStyle.qml rename to linphone-app/ui/modules/Common/Styles/Window/WindowStyle.qml diff --git a/linphone-desktop/ui/modules/Common/Styles/qmldir b/linphone-app/ui/modules/Common/Styles/qmldir similarity index 100% rename from linphone-desktop/ui/modules/Common/Styles/qmldir rename to linphone-app/ui/modules/Common/Styles/qmldir diff --git a/linphone-desktop/ui/modules/Common/Tooltip/Tooltip.qml b/linphone-app/ui/modules/Common/Tooltip/Tooltip.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Tooltip/Tooltip.qml rename to linphone-app/ui/modules/Common/Tooltip/Tooltip.qml diff --git a/linphone-desktop/ui/modules/Common/Tooltip/TooltipArea.qml b/linphone-app/ui/modules/Common/Tooltip/TooltipArea.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Tooltip/TooltipArea.qml rename to linphone-app/ui/modules/Common/Tooltip/TooltipArea.qml diff --git a/linphone-desktop/ui/modules/Common/View/ScrollableListView.qml b/linphone-app/ui/modules/Common/View/ScrollableListView.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/View/ScrollableListView.qml rename to linphone-app/ui/modules/Common/View/ScrollableListView.qml diff --git a/linphone-desktop/ui/modules/Common/Window/ApplicationWindow.qml b/linphone-app/ui/modules/Common/Window/ApplicationWindow.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Window/ApplicationWindow.qml rename to linphone-app/ui/modules/Common/Window/ApplicationWindow.qml diff --git a/linphone-desktop/ui/modules/Common/Window/VirtualWindow.qml b/linphone-app/ui/modules/Common/Window/VirtualWindow.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Window/VirtualWindow.qml rename to linphone-app/ui/modules/Common/Window/VirtualWindow.qml diff --git a/linphone-desktop/ui/modules/Common/Window/Window.js b/linphone-app/ui/modules/Common/Window/Window.js similarity index 100% rename from linphone-desktop/ui/modules/Common/Window/Window.js rename to linphone-app/ui/modules/Common/Window/Window.js diff --git a/linphone-desktop/ui/modules/Common/Window/Window.qml b/linphone-app/ui/modules/Common/Window/Window.qml similarity index 100% rename from linphone-desktop/ui/modules/Common/Window/Window.qml rename to linphone-app/ui/modules/Common/Window/Window.qml diff --git a/linphone-desktop/ui/modules/Common/qmldir b/linphone-app/ui/modules/Common/qmldir similarity index 100% rename from linphone-desktop/ui/modules/Common/qmldir rename to linphone-app/ui/modules/Common/qmldir diff --git a/linphone-desktop/ui/modules/Konami/Konami.qml b/linphone-app/ui/modules/Konami/Konami.qml similarity index 100% rename from linphone-desktop/ui/modules/Konami/Konami.qml rename to linphone-app/ui/modules/Konami/Konami.qml diff --git a/linphone-desktop/ui/modules/Konami/qmldir b/linphone-app/ui/modules/Konami/qmldir similarity index 100% rename from linphone-desktop/ui/modules/Konami/qmldir rename to linphone-app/ui/modules/Konami/qmldir diff --git a/linphone-desktop/ui/modules/Linphone/Account/AccountStatus.qml b/linphone-app/ui/modules/Linphone/Account/AccountStatus.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Account/AccountStatus.qml rename to linphone-app/ui/modules/Linphone/Account/AccountStatus.qml diff --git a/linphone-desktop/ui/modules/Linphone/Blocks/CardBlock.qml b/linphone-app/ui/modules/Linphone/Blocks/CardBlock.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Blocks/CardBlock.qml rename to linphone-app/ui/modules/Linphone/Blocks/CardBlock.qml diff --git a/linphone-desktop/ui/modules/Linphone/Blocks/RequestBlock.qml b/linphone-app/ui/modules/Linphone/Blocks/RequestBlock.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Blocks/RequestBlock.qml rename to linphone-app/ui/modules/Linphone/Blocks/RequestBlock.qml diff --git a/linphone-desktop/ui/modules/Linphone/Calls/CallControls.qml b/linphone-app/ui/modules/Linphone/Calls/CallControls.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Calls/CallControls.qml rename to linphone-app/ui/modules/Linphone/Calls/CallControls.qml diff --git a/linphone-desktop/ui/modules/Linphone/Calls/CallStatistics.qml b/linphone-app/ui/modules/Linphone/Calls/CallStatistics.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Calls/CallStatistics.qml rename to linphone-app/ui/modules/Linphone/Calls/CallStatistics.qml diff --git a/linphone-desktop/ui/modules/Linphone/Calls/Calls.js b/linphone-app/ui/modules/Linphone/Calls/Calls.js similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Calls/Calls.js rename to linphone-app/ui/modules/Linphone/Calls/Calls.js diff --git a/linphone-desktop/ui/modules/Linphone/Calls/Calls.qml b/linphone-app/ui/modules/Linphone/Calls/Calls.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Calls/Calls.qml rename to linphone-app/ui/modules/Linphone/Calls/Calls.qml diff --git a/linphone-desktop/ui/modules/Linphone/Calls/ConferenceControls.qml b/linphone-app/ui/modules/Linphone/Calls/ConferenceControls.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Calls/ConferenceControls.qml rename to linphone-app/ui/modules/Linphone/Calls/ConferenceControls.qml diff --git a/linphone-desktop/ui/modules/Linphone/Chat/Chat.js b/linphone-app/ui/modules/Linphone/Chat/Chat.js similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Chat/Chat.js rename to linphone-app/ui/modules/Linphone/Chat/Chat.js diff --git a/linphone-desktop/ui/modules/Linphone/Chat/Chat.qml b/linphone-app/ui/modules/Linphone/Chat/Chat.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Chat/Chat.qml rename to linphone-app/ui/modules/Linphone/Chat/Chat.qml diff --git a/linphone-desktop/ui/modules/Linphone/Chat/Event.qml b/linphone-app/ui/modules/Linphone/Chat/Event.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Chat/Event.qml rename to linphone-app/ui/modules/Linphone/Chat/Event.qml diff --git a/linphone-desktop/ui/modules/Linphone/Chat/FileMessage.qml b/linphone-app/ui/modules/Linphone/Chat/FileMessage.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Chat/FileMessage.qml rename to linphone-app/ui/modules/Linphone/Chat/FileMessage.qml diff --git a/linphone-desktop/ui/modules/Linphone/Chat/IncomingMessage.qml b/linphone-app/ui/modules/Linphone/Chat/IncomingMessage.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Chat/IncomingMessage.qml rename to linphone-app/ui/modules/Linphone/Chat/IncomingMessage.qml diff --git a/linphone-desktop/ui/modules/Linphone/Chat/Message.js b/linphone-app/ui/modules/Linphone/Chat/Message.js similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Chat/Message.js rename to linphone-app/ui/modules/Linphone/Chat/Message.js diff --git a/linphone-desktop/ui/modules/Linphone/Chat/Message.qml b/linphone-app/ui/modules/Linphone/Chat/Message.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Chat/Message.qml rename to linphone-app/ui/modules/Linphone/Chat/Message.qml diff --git a/linphone-desktop/ui/modules/Linphone/Chat/OutgoingMessage.qml b/linphone-app/ui/modules/Linphone/Chat/OutgoingMessage.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Chat/OutgoingMessage.qml rename to linphone-app/ui/modules/Linphone/Chat/OutgoingMessage.qml diff --git a/linphone-desktop/ui/modules/Linphone/Codecs/CodecAttribute.qml b/linphone-app/ui/modules/Linphone/Codecs/CodecAttribute.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Codecs/CodecAttribute.qml rename to linphone-app/ui/modules/Linphone/Codecs/CodecAttribute.qml diff --git a/linphone-desktop/ui/modules/Linphone/Codecs/CodecLegend.qml b/linphone-app/ui/modules/Linphone/Codecs/CodecLegend.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Codecs/CodecLegend.qml rename to linphone-app/ui/modules/Linphone/Codecs/CodecLegend.qml diff --git a/linphone-desktop/ui/modules/Linphone/Codecs/CodecsViewer.qml b/linphone-app/ui/modules/Linphone/Codecs/CodecsViewer.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Codecs/CodecsViewer.qml rename to linphone-app/ui/modules/Linphone/Codecs/CodecsViewer.qml diff --git a/linphone-desktop/ui/modules/Linphone/Contact/Avatar.qml b/linphone-app/ui/modules/Linphone/Contact/Avatar.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Contact/Avatar.qml rename to linphone-app/ui/modules/Linphone/Contact/Avatar.qml diff --git a/linphone-desktop/ui/modules/Linphone/Contact/Contact.qml b/linphone-app/ui/modules/Linphone/Contact/Contact.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Contact/Contact.qml rename to linphone-app/ui/modules/Linphone/Contact/Contact.qml diff --git a/linphone-desktop/ui/modules/Linphone/Contact/ContactDescription.qml b/linphone-app/ui/modules/Linphone/Contact/ContactDescription.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Contact/ContactDescription.qml rename to linphone-app/ui/modules/Linphone/Contact/ContactDescription.qml diff --git a/linphone-desktop/ui/modules/Linphone/Contact/ContactMessageCounter.qml b/linphone-app/ui/modules/Linphone/Contact/ContactMessageCounter.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Contact/ContactMessageCounter.qml rename to linphone-app/ui/modules/Linphone/Contact/ContactMessageCounter.qml diff --git a/linphone-desktop/ui/modules/Linphone/Dialog/OnlineInstallerDialog.qml b/linphone-app/ui/modules/Linphone/Dialog/OnlineInstallerDialog.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Dialog/OnlineInstallerDialog.qml rename to linphone-app/ui/modules/Linphone/Dialog/OnlineInstallerDialog.qml diff --git a/linphone-desktop/ui/modules/Linphone/Menus/SipAddressesMenu.qml b/linphone-app/ui/modules/Linphone/Menus/SipAddressesMenu.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Menus/SipAddressesMenu.qml rename to linphone-app/ui/modules/Linphone/Menus/SipAddressesMenu.qml diff --git a/linphone-desktop/ui/modules/Linphone/Misc/MessageCounter.qml b/linphone-app/ui/modules/Linphone/Misc/MessageCounter.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Misc/MessageCounter.qml rename to linphone-app/ui/modules/Linphone/Misc/MessageCounter.qml diff --git a/linphone-desktop/ui/modules/Linphone/Notifications/Notification.qml b/linphone-app/ui/modules/Linphone/Notifications/Notification.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Notifications/Notification.qml rename to linphone-app/ui/modules/Linphone/Notifications/Notification.qml diff --git a/linphone-desktop/ui/modules/Linphone/Notifications/Notification.spec.qml b/linphone-app/ui/modules/Linphone/Notifications/Notification.spec.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Notifications/Notification.spec.qml rename to linphone-app/ui/modules/Linphone/Notifications/Notification.spec.qml diff --git a/linphone-desktop/ui/modules/Linphone/Notifications/NotificationBasic.qml b/linphone-app/ui/modules/Linphone/Notifications/NotificationBasic.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Notifications/NotificationBasic.qml rename to linphone-app/ui/modules/Linphone/Notifications/NotificationBasic.qml diff --git a/linphone-desktop/ui/modules/Linphone/Notifications/NotificationNewVersionAvailable.qml b/linphone-app/ui/modules/Linphone/Notifications/NotificationNewVersionAvailable.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Notifications/NotificationNewVersionAvailable.qml rename to linphone-app/ui/modules/Linphone/Notifications/NotificationNewVersionAvailable.qml diff --git a/linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedCall.qml b/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedCall.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedCall.qml rename to linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedCall.qml diff --git a/linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml b/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml rename to linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml diff --git a/linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml b/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml rename to linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml diff --git a/linphone-desktop/ui/modules/Linphone/Notifications/NotificationRecordingCompleted.qml b/linphone-app/ui/modules/Linphone/Notifications/NotificationRecordingCompleted.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Notifications/NotificationRecordingCompleted.qml rename to linphone-app/ui/modules/Linphone/Notifications/NotificationRecordingCompleted.qml diff --git a/linphone-desktop/ui/modules/Linphone/Notifications/NotificationSnapshotWasTaken.qml b/linphone-app/ui/modules/Linphone/Notifications/NotificationSnapshotWasTaken.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Notifications/NotificationSnapshotWasTaken.qml rename to linphone-app/ui/modules/Linphone/Notifications/NotificationSnapshotWasTaken.qml diff --git a/linphone-desktop/ui/modules/Linphone/Presence/PresenceLevel.qml b/linphone-app/ui/modules/Linphone/Presence/PresenceLevel.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Presence/PresenceLevel.qml rename to linphone-app/ui/modules/Linphone/Presence/PresenceLevel.qml diff --git a/linphone-desktop/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml b/linphone-app/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml rename to linphone-app/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml rename to linphone-app/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Blocks/CardBlockStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Blocks/CardBlockStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Styles/Blocks/CardBlockStyle.qml rename to linphone-app/ui/modules/Linphone/Styles/Blocks/CardBlockStyle.qml diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Blocks/RequestBlockStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Blocks/RequestBlockStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Styles/Blocks/RequestBlockStyle.qml rename to linphone-app/ui/modules/Linphone/Styles/Blocks/RequestBlockStyle.qml diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Calls/CallControlsStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Calls/CallControlsStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Styles/Calls/CallControlsStyle.qml rename to linphone-app/ui/modules/Linphone/Styles/Calls/CallControlsStyle.qml diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml rename to linphone-app/ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Calls/CallsStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Calls/CallsStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Styles/Calls/CallsStyle.qml rename to linphone-app/ui/modules/Linphone/Styles/Calls/CallsStyle.qml diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Calls/ConferenceControlsStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Calls/ConferenceControlsStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Styles/Calls/ConferenceControlsStyle.qml rename to linphone-app/ui/modules/Linphone/Styles/Calls/ConferenceControlsStyle.qml diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Chat/ChatStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Chat/ChatStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Styles/Chat/ChatStyle.qml rename to linphone-app/ui/modules/Linphone/Styles/Chat/ChatStyle.qml diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml rename to linphone-app/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml rename to linphone-app/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml rename to linphone-app/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Contact/ContactMessageCounterStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Contact/ContactMessageCounterStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Styles/Contact/ContactMessageCounterStyle.qml rename to linphone-app/ui/modules/Linphone/Styles/Contact/ContactMessageCounterStyle.qml diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Contact/ContactStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Contact/ContactStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Styles/Contact/ContactStyle.qml rename to linphone-app/ui/modules/Linphone/Styles/Contact/ContactStyle.qml diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml rename to linphone-app/ui/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Menus/SipAddressesMenuStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Menus/SipAddressesMenuStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Styles/Menus/SipAddressesMenuStyle.qml rename to linphone-app/ui/modules/Linphone/Styles/Menus/SipAddressesMenuStyle.qml diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Misc/MessageCounterStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Misc/MessageCounterStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Styles/Misc/MessageCounterStyle.qml rename to linphone-app/ui/modules/Linphone/Styles/Misc/MessageCounterStyle.qml diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationBasicStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationBasicStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationBasicStyle.qml rename to linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationBasicStyle.qml diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationReceivedCallStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedCallStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationReceivedCallStyle.qml rename to linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedCallStyle.qml diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationReceivedFileMessageStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedFileMessageStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationReceivedFileMessageStyle.qml rename to linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedFileMessageStyle.qml diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml rename to linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationStyle.qml rename to linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationStyle.qml diff --git a/linphone-desktop/ui/modules/Linphone/Styles/TelKeypad/TelKeypadStyle.qml b/linphone-app/ui/modules/Linphone/Styles/TelKeypad/TelKeypadStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Styles/TelKeypad/TelKeypadStyle.qml rename to linphone-app/ui/modules/Linphone/Styles/TelKeypad/TelKeypadStyle.qml diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml rename to linphone-app/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml diff --git a/linphone-desktop/ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml b/linphone-app/ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml rename to linphone-app/ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml diff --git a/linphone-desktop/ui/modules/Linphone/Styles/qmldir b/linphone-app/ui/modules/Linphone/Styles/qmldir similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Styles/qmldir rename to linphone-app/ui/modules/Linphone/Styles/qmldir diff --git a/linphone-desktop/ui/modules/Linphone/TelKeypad/TelKeypad.js b/linphone-app/ui/modules/Linphone/TelKeypad/TelKeypad.js similarity index 100% rename from linphone-desktop/ui/modules/Linphone/TelKeypad/TelKeypad.js rename to linphone-app/ui/modules/Linphone/TelKeypad/TelKeypad.js diff --git a/linphone-desktop/ui/modules/Linphone/TelKeypad/TelKeypad.qml b/linphone-app/ui/modules/Linphone/TelKeypad/TelKeypad.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/TelKeypad/TelKeypad.qml rename to linphone-app/ui/modules/Linphone/TelKeypad/TelKeypad.qml diff --git a/linphone-desktop/ui/modules/Linphone/TelKeypad/TelKeypadButton.qml b/linphone-app/ui/modules/Linphone/TelKeypad/TelKeypadButton.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/TelKeypad/TelKeypadButton.qml rename to linphone-app/ui/modules/Linphone/TelKeypad/TelKeypadButton.qml diff --git a/linphone-desktop/ui/modules/Linphone/Timeline/Timeline.js b/linphone-app/ui/modules/Linphone/Timeline/Timeline.js similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Timeline/Timeline.js rename to linphone-app/ui/modules/Linphone/Timeline/Timeline.js diff --git a/linphone-desktop/ui/modules/Linphone/Timeline/Timeline.qml b/linphone-app/ui/modules/Linphone/Timeline/Timeline.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/Timeline/Timeline.qml rename to linphone-app/ui/modules/Linphone/Timeline/Timeline.qml diff --git a/linphone-desktop/ui/modules/Linphone/View/SipAddressesView.qml b/linphone-app/ui/modules/Linphone/View/SipAddressesView.qml similarity index 100% rename from linphone-desktop/ui/modules/Linphone/View/SipAddressesView.qml rename to linphone-app/ui/modules/Linphone/View/SipAddressesView.qml diff --git a/linphone-desktop/ui/modules/Linphone/qmldir b/linphone-app/ui/modules/Linphone/qmldir similarity index 100% rename from linphone-desktop/ui/modules/Linphone/qmldir rename to linphone-app/ui/modules/Linphone/qmldir diff --git a/linphone-desktop/ui/scripts/LinphoneUtils/linphone-utils.js b/linphone-app/ui/scripts/LinphoneUtils/linphone-utils.js similarity index 100% rename from linphone-desktop/ui/scripts/LinphoneUtils/linphone-utils.js rename to linphone-app/ui/scripts/LinphoneUtils/linphone-utils.js diff --git a/linphone-desktop/ui/scripts/LinphoneUtils/qmldir b/linphone-app/ui/scripts/LinphoneUtils/qmldir similarity index 100% rename from linphone-desktop/ui/scripts/LinphoneUtils/qmldir rename to linphone-app/ui/scripts/LinphoneUtils/qmldir diff --git a/linphone-desktop/ui/scripts/Utils/port-tools.js b/linphone-app/ui/scripts/Utils/port-tools.js similarity index 100% rename from linphone-desktop/ui/scripts/Utils/port-tools.js rename to linphone-app/ui/scripts/Utils/port-tools.js diff --git a/linphone-desktop/ui/scripts/Utils/qmldir b/linphone-app/ui/scripts/Utils/qmldir similarity index 100% rename from linphone-desktop/ui/scripts/Utils/qmldir rename to linphone-app/ui/scripts/Utils/qmldir diff --git a/linphone-desktop/ui/scripts/Utils/uri-tools.js b/linphone-app/ui/scripts/Utils/uri-tools.js similarity index 100% rename from linphone-desktop/ui/scripts/Utils/uri-tools.js rename to linphone-app/ui/scripts/Utils/uri-tools.js diff --git a/linphone-desktop/ui/scripts/Utils/uri-tools.spec.qml b/linphone-app/ui/scripts/Utils/uri-tools.spec.qml similarity index 100% rename from linphone-desktop/ui/scripts/Utils/uri-tools.spec.qml rename to linphone-app/ui/scripts/Utils/uri-tools.spec.qml diff --git a/linphone-desktop/ui/scripts/Utils/utils.js b/linphone-app/ui/scripts/Utils/utils.js similarity index 100% rename from linphone-desktop/ui/scripts/Utils/utils.js rename to linphone-app/ui/scripts/Utils/utils.js diff --git a/linphone-desktop/ui/scripts/Utils/utils.spec.qml b/linphone-app/ui/scripts/Utils/utils.spec.qml similarity index 100% rename from linphone-desktop/ui/scripts/Utils/utils.spec.qml rename to linphone-app/ui/scripts/Utils/utils.spec.qml diff --git a/linphone-desktop/ui/views/App/Calls/AbstractStartingCall.qml b/linphone-app/ui/views/App/Calls/AbstractStartingCall.qml similarity index 100% rename from linphone-desktop/ui/views/App/Calls/AbstractStartingCall.qml rename to linphone-app/ui/views/App/Calls/AbstractStartingCall.qml diff --git a/linphone-desktop/ui/views/App/Calls/CallsWindow.js b/linphone-app/ui/views/App/Calls/CallsWindow.js similarity index 100% rename from linphone-desktop/ui/views/App/Calls/CallsWindow.js rename to linphone-app/ui/views/App/Calls/CallsWindow.js diff --git a/linphone-desktop/ui/views/App/Calls/CallsWindow.qml b/linphone-app/ui/views/App/Calls/CallsWindow.qml similarity index 100% rename from linphone-desktop/ui/views/App/Calls/CallsWindow.qml rename to linphone-app/ui/views/App/Calls/CallsWindow.qml diff --git a/linphone-desktop/ui/views/App/Calls/Conference.qml b/linphone-app/ui/views/App/Calls/Conference.qml similarity index 100% rename from linphone-desktop/ui/views/App/Calls/Conference.qml rename to linphone-app/ui/views/App/Calls/Conference.qml diff --git a/linphone-desktop/ui/views/App/Calls/Dialogs/CallSipAddress.qml b/linphone-app/ui/views/App/Calls/Dialogs/CallSipAddress.qml similarity index 100% rename from linphone-desktop/ui/views/App/Calls/Dialogs/CallSipAddress.qml rename to linphone-app/ui/views/App/Calls/Dialogs/CallSipAddress.qml diff --git a/linphone-desktop/ui/views/App/Calls/Dialogs/CallTransfer.qml b/linphone-app/ui/views/App/Calls/Dialogs/CallTransfer.qml similarity index 100% rename from linphone-desktop/ui/views/App/Calls/Dialogs/CallTransfer.qml rename to linphone-app/ui/views/App/Calls/Dialogs/CallTransfer.qml diff --git a/linphone-desktop/ui/views/App/Calls/Dialogs/ConferenceManager.qml b/linphone-app/ui/views/App/Calls/Dialogs/ConferenceManager.qml similarity index 100% rename from linphone-desktop/ui/views/App/Calls/Dialogs/ConferenceManager.qml rename to linphone-app/ui/views/App/Calls/Dialogs/ConferenceManager.qml diff --git a/linphone-desktop/ui/views/App/Calls/Dialogs/MultimediaParameters.qml b/linphone-app/ui/views/App/Calls/Dialogs/MultimediaParameters.qml similarity index 100% rename from linphone-desktop/ui/views/App/Calls/Dialogs/MultimediaParameters.qml rename to linphone-app/ui/views/App/Calls/Dialogs/MultimediaParameters.qml diff --git a/linphone-desktop/ui/views/App/Calls/EndedCall.qml b/linphone-app/ui/views/App/Calls/EndedCall.qml similarity index 100% rename from linphone-desktop/ui/views/App/Calls/EndedCall.qml rename to linphone-app/ui/views/App/Calls/EndedCall.qml diff --git a/linphone-desktop/ui/views/App/Calls/Incall.js b/linphone-app/ui/views/App/Calls/Incall.js similarity index 100% rename from linphone-desktop/ui/views/App/Calls/Incall.js rename to linphone-app/ui/views/App/Calls/Incall.js diff --git a/linphone-desktop/ui/views/App/Calls/Incall.qml b/linphone-app/ui/views/App/Calls/Incall.qml similarity index 100% rename from linphone-desktop/ui/views/App/Calls/Incall.qml rename to linphone-app/ui/views/App/Calls/Incall.qml diff --git a/linphone-desktop/ui/views/App/Calls/IncallAvatar.qml b/linphone-app/ui/views/App/Calls/IncallAvatar.qml similarity index 100% rename from linphone-desktop/ui/views/App/Calls/IncallAvatar.qml rename to linphone-app/ui/views/App/Calls/IncallAvatar.qml diff --git a/linphone-desktop/ui/views/App/Calls/IncallFullscreenWindow.qml b/linphone-app/ui/views/App/Calls/IncallFullscreenWindow.qml similarity index 100% rename from linphone-desktop/ui/views/App/Calls/IncallFullscreenWindow.qml rename to linphone-app/ui/views/App/Calls/IncallFullscreenWindow.qml diff --git a/linphone-desktop/ui/views/App/Calls/IncomingCall.qml b/linphone-app/ui/views/App/Calls/IncomingCall.qml similarity index 100% rename from linphone-desktop/ui/views/App/Calls/IncomingCall.qml rename to linphone-app/ui/views/App/Calls/IncomingCall.qml diff --git a/linphone-desktop/ui/views/App/Calls/OutgoingCall.qml b/linphone-app/ui/views/App/Calls/OutgoingCall.qml similarity index 100% rename from linphone-desktop/ui/views/App/Calls/OutgoingCall.qml rename to linphone-app/ui/views/App/Calls/OutgoingCall.qml diff --git a/linphone-desktop/ui/views/App/Calls/ZrtpTokenAuthentication.qml b/linphone-app/ui/views/App/Calls/ZrtpTokenAuthentication.qml similarity index 100% rename from linphone-desktop/ui/views/App/Calls/ZrtpTokenAuthentication.qml rename to linphone-app/ui/views/App/Calls/ZrtpTokenAuthentication.qml diff --git a/linphone-desktop/ui/views/App/Main/Assistant.qml b/linphone-app/ui/views/App/Main/Assistant.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/Assistant.qml rename to linphone-app/ui/views/App/Main/Assistant.qml diff --git a/linphone-desktop/ui/views/App/Main/Assistant/ActivateAppSipAccountWithEmail.qml b/linphone-app/ui/views/App/Main/Assistant/ActivateAppSipAccountWithEmail.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/Assistant/ActivateAppSipAccountWithEmail.qml rename to linphone-app/ui/views/App/Main/Assistant/ActivateAppSipAccountWithEmail.qml diff --git a/linphone-desktop/ui/views/App/Main/Assistant/ActivateAppSipAccountWithPhoneNumber.qml b/linphone-app/ui/views/App/Main/Assistant/ActivateAppSipAccountWithPhoneNumber.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/Assistant/ActivateAppSipAccountWithPhoneNumber.qml rename to linphone-app/ui/views/App/Main/Assistant/ActivateAppSipAccountWithPhoneNumber.qml diff --git a/linphone-desktop/ui/views/App/Main/Assistant/AssistantAbstractView.qml b/linphone-app/ui/views/App/Main/Assistant/AssistantAbstractView.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/Assistant/AssistantAbstractView.qml rename to linphone-app/ui/views/App/Main/Assistant/AssistantAbstractView.qml diff --git a/linphone-desktop/ui/views/App/Main/Assistant/AssistantHome.qml b/linphone-app/ui/views/App/Main/Assistant/AssistantHome.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/Assistant/AssistantHome.qml rename to linphone-app/ui/views/App/Main/Assistant/AssistantHome.qml diff --git a/linphone-desktop/ui/views/App/Main/Assistant/CreateAppSipAccount.qml b/linphone-app/ui/views/App/Main/Assistant/CreateAppSipAccount.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/Assistant/CreateAppSipAccount.qml rename to linphone-app/ui/views/App/Main/Assistant/CreateAppSipAccount.qml diff --git a/linphone-desktop/ui/views/App/Main/Assistant/CreateAppSipAccountWithEmail.qml b/linphone-app/ui/views/App/Main/Assistant/CreateAppSipAccountWithEmail.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/Assistant/CreateAppSipAccountWithEmail.qml rename to linphone-app/ui/views/App/Main/Assistant/CreateAppSipAccountWithEmail.qml diff --git a/linphone-desktop/ui/views/App/Main/Assistant/CreateAppSipAccountWithPhoneNumber.qml b/linphone-app/ui/views/App/Main/Assistant/CreateAppSipAccountWithPhoneNumber.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/Assistant/CreateAppSipAccountWithPhoneNumber.qml rename to linphone-app/ui/views/App/Main/Assistant/CreateAppSipAccountWithPhoneNumber.qml diff --git a/linphone-desktop/ui/views/App/Main/Assistant/FetchRemoteConfiguration.qml b/linphone-app/ui/views/App/Main/Assistant/FetchRemoteConfiguration.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/Assistant/FetchRemoteConfiguration.qml rename to linphone-app/ui/views/App/Main/Assistant/FetchRemoteConfiguration.qml diff --git a/linphone-desktop/ui/views/App/Main/Assistant/UseAppSipAccount.qml b/linphone-app/ui/views/App/Main/Assistant/UseAppSipAccount.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/Assistant/UseAppSipAccount.qml rename to linphone-app/ui/views/App/Main/Assistant/UseAppSipAccount.qml diff --git a/linphone-desktop/ui/views/App/Main/Assistant/UseAppSipAccountWithPhoneNumber.qml b/linphone-app/ui/views/App/Main/Assistant/UseAppSipAccountWithPhoneNumber.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/Assistant/UseAppSipAccountWithPhoneNumber.qml rename to linphone-app/ui/views/App/Main/Assistant/UseAppSipAccountWithPhoneNumber.qml diff --git a/linphone-desktop/ui/views/App/Main/Assistant/UseAppSipAccountWithUsername.qml b/linphone-app/ui/views/App/Main/Assistant/UseAppSipAccountWithUsername.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/Assistant/UseAppSipAccountWithUsername.qml rename to linphone-app/ui/views/App/Main/Assistant/UseAppSipAccountWithUsername.qml diff --git a/linphone-desktop/ui/views/App/Main/Assistant/UseOtherSipAccount.qml b/linphone-app/ui/views/App/Main/Assistant/UseOtherSipAccount.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/Assistant/UseOtherSipAccount.qml rename to linphone-app/ui/views/App/Main/Assistant/UseOtherSipAccount.qml diff --git a/linphone-desktop/ui/views/App/Main/ContactEdit.js b/linphone-app/ui/views/App/Main/ContactEdit.js similarity index 100% rename from linphone-desktop/ui/views/App/Main/ContactEdit.js rename to linphone-app/ui/views/App/Main/ContactEdit.js diff --git a/linphone-desktop/ui/views/App/Main/ContactEdit.qml b/linphone-app/ui/views/App/Main/ContactEdit.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/ContactEdit.qml rename to linphone-app/ui/views/App/Main/ContactEdit.qml diff --git a/linphone-desktop/ui/views/App/Main/Contacts.qml b/linphone-app/ui/views/App/Main/Contacts.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/Contacts.qml rename to linphone-app/ui/views/App/Main/Contacts.qml diff --git a/linphone-desktop/ui/views/App/Main/Conversation.js b/linphone-app/ui/views/App/Main/Conversation.js similarity index 100% rename from linphone-desktop/ui/views/App/Main/Conversation.js rename to linphone-app/ui/views/App/Main/Conversation.js diff --git a/linphone-desktop/ui/views/App/Main/Conversation.qml b/linphone-app/ui/views/App/Main/Conversation.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/Conversation.qml rename to linphone-app/ui/views/App/Main/Conversation.qml diff --git a/linphone-desktop/ui/views/App/Main/Dialogs/About.qml b/linphone-app/ui/views/App/Main/Dialogs/About.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/Dialogs/About.qml rename to linphone-app/ui/views/App/Main/Dialogs/About.qml diff --git a/linphone-desktop/ui/views/App/Main/Dialogs/AuthenticationRequest.js b/linphone-app/ui/views/App/Main/Dialogs/AuthenticationRequest.js similarity index 100% rename from linphone-desktop/ui/views/App/Main/Dialogs/AuthenticationRequest.js rename to linphone-app/ui/views/App/Main/Dialogs/AuthenticationRequest.js diff --git a/linphone-desktop/ui/views/App/Main/Dialogs/AuthenticationRequest.qml b/linphone-app/ui/views/App/Main/Dialogs/AuthenticationRequest.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/Dialogs/AuthenticationRequest.qml rename to linphone-app/ui/views/App/Main/Dialogs/AuthenticationRequest.qml diff --git a/linphone-desktop/ui/views/App/Main/Dialogs/ManageAccount.js b/linphone-app/ui/views/App/Main/Dialogs/ManageAccount.js similarity index 100% rename from linphone-desktop/ui/views/App/Main/Dialogs/ManageAccount.js rename to linphone-app/ui/views/App/Main/Dialogs/ManageAccount.js diff --git a/linphone-desktop/ui/views/App/Main/Dialogs/ManageAccounts.qml b/linphone-app/ui/views/App/Main/Dialogs/ManageAccounts.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/Dialogs/ManageAccounts.qml rename to linphone-app/ui/views/App/Main/Dialogs/ManageAccounts.qml diff --git a/linphone-desktop/ui/views/App/Main/Home.qml b/linphone-app/ui/views/App/Main/Home.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/Home.qml rename to linphone-app/ui/views/App/Main/Home.qml diff --git a/linphone-desktop/ui/views/App/Main/InviteFriends.qml b/linphone-app/ui/views/App/Main/InviteFriends.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/InviteFriends.qml rename to linphone-app/ui/views/App/Main/InviteFriends.qml diff --git a/linphone-desktop/ui/views/App/Main/MainWindow.js b/linphone-app/ui/views/App/Main/MainWindow.js similarity index 100% rename from linphone-desktop/ui/views/App/Main/MainWindow.js rename to linphone-app/ui/views/App/Main/MainWindow.js diff --git a/linphone-desktop/ui/views/App/Main/MainWindow.qml b/linphone-app/ui/views/App/Main/MainWindow.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/MainWindow.qml rename to linphone-app/ui/views/App/Main/MainWindow.qml diff --git a/linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml b/linphone-app/ui/views/App/Main/MainWindowMenuBar.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml rename to linphone-app/ui/views/App/Main/MainWindowMenuBar.qml diff --git a/linphone-desktop/ui/views/App/Main/MainWindowTopMenuBar.qml b/linphone-app/ui/views/App/Main/MainWindowTopMenuBar.qml similarity index 100% rename from linphone-desktop/ui/views/App/Main/MainWindowTopMenuBar.qml rename to linphone-app/ui/views/App/Main/MainWindowTopMenuBar.qml diff --git a/linphone-desktop/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.js b/linphone-app/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.js similarity index 100% rename from linphone-desktop/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.js rename to linphone-app/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.js diff --git a/linphone-desktop/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.qml b/linphone-app/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.qml similarity index 100% rename from linphone-desktop/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.qml rename to linphone-app/ui/views/App/Settings/Dialogs/SettingsSipAccountsEdit.qml diff --git a/linphone-desktop/ui/views/App/Settings/Dialogs/SettingsVideoPreview.qml b/linphone-app/ui/views/App/Settings/Dialogs/SettingsVideoPreview.qml similarity index 100% rename from linphone-desktop/ui/views/App/Settings/Dialogs/SettingsVideoPreview.qml rename to linphone-app/ui/views/App/Settings/Dialogs/SettingsVideoPreview.qml diff --git a/linphone-desktop/ui/views/App/Settings/SettingsAdvanced.js b/linphone-app/ui/views/App/Settings/SettingsAdvanced.js similarity index 100% rename from linphone-desktop/ui/views/App/Settings/SettingsAdvanced.js rename to linphone-app/ui/views/App/Settings/SettingsAdvanced.js diff --git a/linphone-desktop/ui/views/App/Settings/SettingsAdvanced.qml b/linphone-app/ui/views/App/Settings/SettingsAdvanced.qml similarity index 100% rename from linphone-desktop/ui/views/App/Settings/SettingsAdvanced.qml rename to linphone-app/ui/views/App/Settings/SettingsAdvanced.qml diff --git a/linphone-desktop/ui/views/App/Settings/SettingsAudio.qml b/linphone-app/ui/views/App/Settings/SettingsAudio.qml similarity index 100% rename from linphone-desktop/ui/views/App/Settings/SettingsAudio.qml rename to linphone-app/ui/views/App/Settings/SettingsAudio.qml diff --git a/linphone-desktop/ui/views/App/Settings/SettingsCallsChat.qml b/linphone-app/ui/views/App/Settings/SettingsCallsChat.qml similarity index 100% rename from linphone-desktop/ui/views/App/Settings/SettingsCallsChat.qml rename to linphone-app/ui/views/App/Settings/SettingsCallsChat.qml diff --git a/linphone-desktop/ui/views/App/Settings/SettingsNetwork.qml b/linphone-app/ui/views/App/Settings/SettingsNetwork.qml similarity index 100% rename from linphone-desktop/ui/views/App/Settings/SettingsNetwork.qml rename to linphone-app/ui/views/App/Settings/SettingsNetwork.qml diff --git a/linphone-desktop/ui/views/App/Settings/SettingsSipAccounts.js b/linphone-app/ui/views/App/Settings/SettingsSipAccounts.js similarity index 100% rename from linphone-desktop/ui/views/App/Settings/SettingsSipAccounts.js rename to linphone-app/ui/views/App/Settings/SettingsSipAccounts.js diff --git a/linphone-desktop/ui/views/App/Settings/SettingsSipAccounts.qml b/linphone-app/ui/views/App/Settings/SettingsSipAccounts.qml similarity index 100% rename from linphone-desktop/ui/views/App/Settings/SettingsSipAccounts.qml rename to linphone-app/ui/views/App/Settings/SettingsSipAccounts.qml diff --git a/linphone-desktop/ui/views/App/Settings/SettingsUi.js b/linphone-app/ui/views/App/Settings/SettingsUi.js similarity index 100% rename from linphone-desktop/ui/views/App/Settings/SettingsUi.js rename to linphone-app/ui/views/App/Settings/SettingsUi.js diff --git a/linphone-desktop/ui/views/App/Settings/SettingsUi.qml b/linphone-app/ui/views/App/Settings/SettingsUi.qml similarity index 100% rename from linphone-desktop/ui/views/App/Settings/SettingsUi.qml rename to linphone-app/ui/views/App/Settings/SettingsUi.qml diff --git a/linphone-desktop/ui/views/App/Settings/SettingsVideo.js b/linphone-app/ui/views/App/Settings/SettingsVideo.js similarity index 100% rename from linphone-desktop/ui/views/App/Settings/SettingsVideo.js rename to linphone-app/ui/views/App/Settings/SettingsVideo.js diff --git a/linphone-desktop/ui/views/App/Settings/SettingsVideo.qml b/linphone-app/ui/views/App/Settings/SettingsVideo.qml similarity index 100% rename from linphone-desktop/ui/views/App/Settings/SettingsVideo.qml rename to linphone-app/ui/views/App/Settings/SettingsVideo.qml diff --git a/linphone-desktop/ui/views/App/Settings/SettingsWindow.qml b/linphone-app/ui/views/App/Settings/SettingsWindow.qml similarity index 100% rename from linphone-desktop/ui/views/App/Settings/SettingsWindow.qml rename to linphone-app/ui/views/App/Settings/SettingsWindow.qml diff --git a/linphone-desktop/ui/views/App/Styles/Calls/CallStyle.qml b/linphone-app/ui/views/App/Styles/Calls/CallStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Calls/CallStyle.qml rename to linphone-app/ui/views/App/Styles/Calls/CallStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Calls/CallsWindowStyle.qml b/linphone-app/ui/views/App/Styles/Calls/CallsWindowStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Calls/CallsWindowStyle.qml rename to linphone-app/ui/views/App/Styles/Calls/CallsWindowStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Calls/ConferenceStyle.qml b/linphone-app/ui/views/App/Styles/Calls/ConferenceStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Calls/ConferenceStyle.qml rename to linphone-app/ui/views/App/Styles/Calls/ConferenceStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Calls/Dialogs/CallSipAddressStyle.qml b/linphone-app/ui/views/App/Styles/Calls/Dialogs/CallSipAddressStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Calls/Dialogs/CallSipAddressStyle.qml rename to linphone-app/ui/views/App/Styles/Calls/Dialogs/CallSipAddressStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Calls/Dialogs/CallTransferStyle.qml b/linphone-app/ui/views/App/Styles/Calls/Dialogs/CallTransferStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Calls/Dialogs/CallTransferStyle.qml rename to linphone-app/ui/views/App/Styles/Calls/Dialogs/CallTransferStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Calls/Dialogs/ConferenceManagerStyle.qml b/linphone-app/ui/views/App/Styles/Calls/Dialogs/ConferenceManagerStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Calls/Dialogs/ConferenceManagerStyle.qml rename to linphone-app/ui/views/App/Styles/Calls/Dialogs/ConferenceManagerStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Calls/Dialogs/MultimediaParametersStyle.qml b/linphone-app/ui/views/App/Styles/Calls/Dialogs/MultimediaParametersStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Calls/Dialogs/MultimediaParametersStyle.qml rename to linphone-app/ui/views/App/Styles/Calls/Dialogs/MultimediaParametersStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithEmailStyle.qml b/linphone-app/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithEmailStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithEmailStyle.qml rename to linphone-app/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithEmailStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithPhoneNumberStyle.qml b/linphone-app/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithPhoneNumberStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithPhoneNumberStyle.qml rename to linphone-app/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithPhoneNumberStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml b/linphone-app/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml rename to linphone-app/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml b/linphone-app/ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml rename to linphone-app/ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Main/Assistant/CreateAppSipAccountStyle.qml b/linphone-app/ui/views/App/Styles/Main/Assistant/CreateAppSipAccountStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Main/Assistant/CreateAppSipAccountStyle.qml rename to linphone-app/ui/views/App/Styles/Main/Assistant/CreateAppSipAccountStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Main/Assistant/UseAppSipAccountStyle.qml b/linphone-app/ui/views/App/Styles/Main/Assistant/UseAppSipAccountStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Main/Assistant/UseAppSipAccountStyle.qml rename to linphone-app/ui/views/App/Styles/Main/Assistant/UseAppSipAccountStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Main/AssistantStyle.qml b/linphone-app/ui/views/App/Styles/Main/AssistantStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Main/AssistantStyle.qml rename to linphone-app/ui/views/App/Styles/Main/AssistantStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Main/ContactEditStyle.qml b/linphone-app/ui/views/App/Styles/Main/ContactEditStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Main/ContactEditStyle.qml rename to linphone-app/ui/views/App/Styles/Main/ContactEditStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Main/ContactsStyle.qml b/linphone-app/ui/views/App/Styles/Main/ContactsStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Main/ContactsStyle.qml rename to linphone-app/ui/views/App/Styles/Main/ContactsStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Main/ConversationStyle.qml b/linphone-app/ui/views/App/Styles/Main/ConversationStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Main/ConversationStyle.qml rename to linphone-app/ui/views/App/Styles/Main/ConversationStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Main/Dialogs/AboutStyle.qml b/linphone-app/ui/views/App/Styles/Main/Dialogs/AboutStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Main/Dialogs/AboutStyle.qml rename to linphone-app/ui/views/App/Styles/Main/Dialogs/AboutStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Main/Dialogs/AuthenticationRequestStyle.qml b/linphone-app/ui/views/App/Styles/Main/Dialogs/AuthenticationRequestStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Main/Dialogs/AuthenticationRequestStyle.qml rename to linphone-app/ui/views/App/Styles/Main/Dialogs/AuthenticationRequestStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml b/linphone-app/ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml rename to linphone-app/ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Main/HomeStyle.qml b/linphone-app/ui/views/App/Styles/Main/HomeStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Main/HomeStyle.qml rename to linphone-app/ui/views/App/Styles/Main/HomeStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Main/InviteFriendsStyle.qml b/linphone-app/ui/views/App/Styles/Main/InviteFriendsStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Main/InviteFriendsStyle.qml rename to linphone-app/ui/views/App/Styles/Main/InviteFriendsStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Main/MainWindowStyle.qml b/linphone-app/ui/views/App/Styles/Main/MainWindowStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Main/MainWindowStyle.qml rename to linphone-app/ui/views/App/Styles/Main/MainWindowStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Settings/Dialogs/SettingsSipAccountsEditStyle.qml b/linphone-app/ui/views/App/Styles/Settings/Dialogs/SettingsSipAccountsEditStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Settings/Dialogs/SettingsSipAccountsEditStyle.qml rename to linphone-app/ui/views/App/Styles/Settings/Dialogs/SettingsSipAccountsEditStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Settings/Dialogs/SettingsVideoPreviewStyle.qml b/linphone-app/ui/views/App/Styles/Settings/Dialogs/SettingsVideoPreviewStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Settings/Dialogs/SettingsVideoPreviewStyle.qml rename to linphone-app/ui/views/App/Styles/Settings/Dialogs/SettingsVideoPreviewStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Settings/SettingsAdvancedStyle.qml b/linphone-app/ui/views/App/Styles/Settings/SettingsAdvancedStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Settings/SettingsAdvancedStyle.qml rename to linphone-app/ui/views/App/Styles/Settings/SettingsAdvancedStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Settings/SettingsAudioStyle.qml b/linphone-app/ui/views/App/Styles/Settings/SettingsAudioStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Settings/SettingsAudioStyle.qml rename to linphone-app/ui/views/App/Styles/Settings/SettingsAudioStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/Settings/SettingsWindowStyle.qml b/linphone-app/ui/views/App/Styles/Settings/SettingsWindowStyle.qml similarity index 100% rename from linphone-desktop/ui/views/App/Styles/Settings/SettingsWindowStyle.qml rename to linphone-app/ui/views/App/Styles/Settings/SettingsWindowStyle.qml diff --git a/linphone-desktop/ui/views/App/Styles/qmldir b/linphone-app/ui/views/App/Styles/qmldir similarity index 100% rename from linphone-desktop/ui/views/App/Styles/qmldir rename to linphone-app/ui/views/App/Styles/qmldir From 6215976d269e3a9acd6094f624040bcb4eaf217e Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Thu, 26 Mar 2020 16:50:19 +0100 Subject: [PATCH 18/20] Update source folder links --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 023e88cae..f34af1142 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -161,7 +161,7 @@ pkg_search_module(MINIZIP minizip) if(NOT (LinphoneCxx_FOUND) OR NOT (Linphone_FOUND) OR NOT (bctoolbox_FOUND) OR NOT (belcard_FOUND) OR NOT (Mediastreamer2_FOUND) OR NOT (ortp_FOUND) OR NOT(MINIZIP_FOUND) ) message("Projects are set as External projects. You can start building them by using for example : cmake --build . --target all") ExternalProject_Add(linphone-qt PREFIX "${CMAKE_BINARY_DIR}/linphoneqt" - SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-desktop" + SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app" INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" DEPENDS miniziplib sdk BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} @@ -177,10 +177,10 @@ if(NOT (LinphoneCxx_FOUND) OR NOT (Linphone_FOUND) OR NOT (bctoolbox_FOUND) OR N else() message("Adding Linphone Desktop in an IDE-friendly state") set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}") - add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-desktop) + add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app) endif() ExternalProject_Add(linphoneqt-only PREFIX "${CMAKE_BINARY_DIR}/linphoneqt" - SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-desktop" + SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app" INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} LIST_SEPARATOR | # Use the alternate list separator From 2065446d7880d8bee34ae5b93f76ee0c909b86a6 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Thu, 26 Mar 2020 18:57:18 +0100 Subject: [PATCH 19/20] Update submodule --- submodules/externals/minizip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/externals/minizip b/submodules/externals/minizip index a86770f17..2f6bc0708 160000 --- a/submodules/externals/minizip +++ b/submodules/externals/minizip @@ -1 +1 @@ -Subproject commit a86770f17215a189c81db7f5e1b8a8edd0841b09 +Subproject commit 2f6bc0708f1388258b2740eaff4afcb4b31cfd68 From 71e4adf3484adf0f30bd49ba4c8b64d97b8b1732 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Thu, 26 Mar 2020 19:15:34 +0100 Subject: [PATCH 20/20] Update the correct submodule --- submodules/externals/minizip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/externals/minizip b/submodules/externals/minizip index 2f6bc0708..470f4c8ef 160000 --- a/submodules/externals/minizip +++ b/submodules/externals/minizip @@ -1 +1 @@ -Subproject commit 2f6bc0708f1388258b2740eaff4afcb4b31cfd68 +Subproject commit 470f4c8ef31925b591aac522a2d4187baf8f54dd