From 88f5fb1f1c219db6b0cfe2b222dc17d7af3dd81e Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 27 Sep 2016 09:12:10 +0200 Subject: [PATCH] fix(app): move `Linphone` dir in `modules` dir --- tests/linphone.pro | 36 +++---- tests/resources.qrc | 96 +++++++++---------- tests/src/main.cpp | 4 +- tests/ui/{ => modules}/Linphone/Chat/Chat.qml | 0 .../ui/{ => modules}/Linphone/Chat/Event.qml | 0 .../Linphone/Chat/IncomingMessage.qml | 0 .../{ => modules}/Linphone/Chat/Message.qml | 0 .../Linphone/Chat/OutgoingMessage.qml | 0 .../Linphone/Collapse/Collapse.qml | 0 tests/ui/{ => modules}/Linphone/Constants.qml | 0 .../{ => modules}/Linphone/Contact/Avatar.qml | 0 .../Linphone/Contact/Contact.qml | 0 .../Linphone/Contact/ContactDescription.qml | 0 .../Linphone/Dialog/ConfirmDialog.qml | 0 .../Linphone/Dialog/DialogDescription.qml | 0 .../Linphone/Dialog/DialogPlus.qml | 0 .../{ => modules}/Linphone/Form/ActionBar.qml | 0 .../Linphone/Form/ActionButton.qml | 0 .../Linphone/Form/CheckBoxText.qml | 0 .../Linphone/Form/DarkButton.qml | 0 .../{ => modules}/Linphone/Form/DropZone.qml | 0 .../Linphone/Form/ExclusiveButtons.qml | 0 .../Linphone/Form/LightButton.qml | 0 .../{ => modules}/Linphone/Form/ListForm.qml | 0 .../Linphone/Form/SmallButton.qml | 0 .../Linphone/Form/TransparentComboBox.qml | 0 .../ui/{ => modules}/Linphone/Image/Icon.qml | 0 .../InvertedMouseArea/InvertedMouseArea.qml | 0 .../{ => modules}/Linphone/Misc/MenuEntry.qml | 0 .../Linphone/Popup/DropDownMenu.qml | 0 .../Linphone/Popup/PopupShadow.qml | 0 .../Linphone/ScrollBar/ForceScrollBar.qml | 0 .../Linphone/SearchBox/SearchBox.qml | 0 .../Linphone/Select/SelectContact.qml | 0 .../Linphone/Styles/CollapseStyle.qml | 0 .../Linphone/Styles/DialogStyle.qml | 0 .../Linphone/Styles/PopupStyle.qml | 0 .../Linphone/Styles/ScrollBarStyle.qml | 0 .../Linphone/Styles/SearchBoxStyle.qml | 0 .../Linphone/Styles/TimelineStyle.qml | 0 tests/ui/{ => modules}/Linphone/Styles/qmldir | 0 .../Linphone/Timeline/Timeline.qml | 0 .../Linphone/View/ScrollableListView.qml | 0 tests/ui/{ => modules}/Linphone/qmldir | 0 tests/ui/scripts/utils.js | 2 +- .../{Views => views}/MainWindow/Contact.qml | 0 .../{Views => views}/MainWindow/Contacts.qml | 0 .../MainWindow/Conversation.qml | 0 tests/ui/{Views => views}/MainWindow/Home.qml | 0 .../MainWindow/MainWindow.qml | 2 +- tests/ui/{Views => views}/ManageAccounts.qml | 0 tests/ui/{Views => views}/NewCall.qml | 0 52 files changed, 70 insertions(+), 70 deletions(-) rename tests/ui/{ => modules}/Linphone/Chat/Chat.qml (100%) rename tests/ui/{ => modules}/Linphone/Chat/Event.qml (100%) rename tests/ui/{ => modules}/Linphone/Chat/IncomingMessage.qml (100%) rename tests/ui/{ => modules}/Linphone/Chat/Message.qml (100%) rename tests/ui/{ => modules}/Linphone/Chat/OutgoingMessage.qml (100%) rename tests/ui/{ => modules}/Linphone/Collapse/Collapse.qml (100%) rename tests/ui/{ => modules}/Linphone/Constants.qml (100%) rename tests/ui/{ => modules}/Linphone/Contact/Avatar.qml (100%) rename tests/ui/{ => modules}/Linphone/Contact/Contact.qml (100%) rename tests/ui/{ => modules}/Linphone/Contact/ContactDescription.qml (100%) rename tests/ui/{ => modules}/Linphone/Dialog/ConfirmDialog.qml (100%) rename tests/ui/{ => modules}/Linphone/Dialog/DialogDescription.qml (100%) rename tests/ui/{ => modules}/Linphone/Dialog/DialogPlus.qml (100%) rename tests/ui/{ => modules}/Linphone/Form/ActionBar.qml (100%) rename tests/ui/{ => modules}/Linphone/Form/ActionButton.qml (100%) rename tests/ui/{ => modules}/Linphone/Form/CheckBoxText.qml (100%) rename tests/ui/{ => modules}/Linphone/Form/DarkButton.qml (100%) rename tests/ui/{ => modules}/Linphone/Form/DropZone.qml (100%) rename tests/ui/{ => modules}/Linphone/Form/ExclusiveButtons.qml (100%) rename tests/ui/{ => modules}/Linphone/Form/LightButton.qml (100%) rename tests/ui/{ => modules}/Linphone/Form/ListForm.qml (100%) rename tests/ui/{ => modules}/Linphone/Form/SmallButton.qml (100%) rename tests/ui/{ => modules}/Linphone/Form/TransparentComboBox.qml (100%) rename tests/ui/{ => modules}/Linphone/Image/Icon.qml (100%) rename tests/ui/{ => modules}/Linphone/InvertedMouseArea/InvertedMouseArea.qml (100%) rename tests/ui/{ => modules}/Linphone/Misc/MenuEntry.qml (100%) rename tests/ui/{ => modules}/Linphone/Popup/DropDownMenu.qml (100%) rename tests/ui/{ => modules}/Linphone/Popup/PopupShadow.qml (100%) rename tests/ui/{ => modules}/Linphone/ScrollBar/ForceScrollBar.qml (100%) rename tests/ui/{ => modules}/Linphone/SearchBox/SearchBox.qml (100%) rename tests/ui/{ => modules}/Linphone/Select/SelectContact.qml (100%) rename tests/ui/{ => modules}/Linphone/Styles/CollapseStyle.qml (100%) rename tests/ui/{ => modules}/Linphone/Styles/DialogStyle.qml (100%) rename tests/ui/{ => modules}/Linphone/Styles/PopupStyle.qml (100%) rename tests/ui/{ => modules}/Linphone/Styles/ScrollBarStyle.qml (100%) rename tests/ui/{ => modules}/Linphone/Styles/SearchBoxStyle.qml (100%) rename tests/ui/{ => modules}/Linphone/Styles/TimelineStyle.qml (100%) rename tests/ui/{ => modules}/Linphone/Styles/qmldir (100%) rename tests/ui/{ => modules}/Linphone/Timeline/Timeline.qml (100%) rename tests/ui/{ => modules}/Linphone/View/ScrollableListView.qml (100%) rename tests/ui/{ => modules}/Linphone/qmldir (100%) rename tests/ui/{Views => views}/MainWindow/Contact.qml (100%) rename tests/ui/{Views => views}/MainWindow/Contacts.qml (100%) rename tests/ui/{Views => views}/MainWindow/Conversation.qml (100%) rename tests/ui/{Views => views}/MainWindow/Home.qml (100%) rename tests/ui/{Views => views}/MainWindow/MainWindow.qml (98%) rename tests/ui/{Views => views}/ManageAccounts.qml (100%) rename tests/ui/{Views => views}/NewCall.qml (100%) diff --git a/tests/linphone.pro b/tests/linphone.pro index fd3fa69ec..5ec102a1a 100644 --- a/tests/linphone.pro +++ b/tests/linphone.pro @@ -27,23 +27,23 @@ TRANSLATIONS = \ lupdate_only{ SOURCES = \ - ui/Linphone/*.qml \ - ui/Linphone/Chat/*.qml \ - ui/Linphone/Collapse/*.qml \ - ui/Linphone/Contact/*.qml \ - ui/Linphone/Dialog/*.qml \ - ui/Linphone/Form/*.qml \ - ui/Linphone/Image/*.qml \ - ui/Linphone/InvertedMouseArea/*.qml \ - ui/Linphone/Misc/*.qml \ - ui/Linphone/Popup/*.qml \ - ui/Linphone/ScrollBar/*.qml \ - ui/Linphone/SearchBox/*.qml \ - ui/Linphone/Select/*.qml \ - ui/Linphone/Styles/*.qml \ - ui/Linphone/Timeline/*.qml \ - ui/Linphone/View/*.qml \ - ui/Views/*.qml \ - ui/Views/MainWindow/*.qml \ + ui/modules/Linphone/*.qml \ + ui/modules/Linphone/Chat/*.qml \ + ui/modules/Linphone/Collapse/*.qml \ + ui/modules/Linphone/Contact/*.qml \ + ui/modules/Linphone/Dialog/*.qml \ + ui/modules/Linphone/Form/*.qml \ + ui/modules/Linphone/Image/*.qml \ + ui/modules/Linphone/InvertedMouseArea/*.qml \ + ui/modules/Linphone/Misc/*.qml \ + ui/modules/Linphone/Popup/*.qml \ + ui/modules/Linphone/ScrollBar/*.qml \ + ui/modules/Linphone/SearchBox/*.qml \ + ui/modules/Linphone/Select/*.qml \ + ui/modules/Linphone/Styles/*.qml \ + ui/modules/Linphone/Timeline/*.qml \ + ui/modules/Linphone/View/*.qml \ + ui/views/*.qml \ + ui/views/MainWindow/*.qml \ } diff --git a/tests/resources.qrc b/tests/resources.qrc index c318ee7dd..97cef444c 100644 --- a/tests/resources.qrc +++ b/tests/resources.qrc @@ -21,54 +21,54 @@ imgs/valid.svg languages/en.qm languages/fr.qm - ui/Linphone/Chat/Chat.qml - ui/Linphone/Chat/Event.qml - ui/Linphone/Chat/IncomingMessage.qml - ui/Linphone/Chat/Message.qml - ui/Linphone/Chat/OutgoingMessage.qml - ui/Linphone/Collapse/Collapse.qml - ui/Linphone/Constants.qml - ui/Linphone/Contact/Avatar.qml - ui/Linphone/Contact/ContactDescription.qml - ui/Linphone/Contact/Contact.qml - ui/Linphone/Dialog/ConfirmDialog.qml - ui/Linphone/Dialog/DialogDescription.qml - ui/Linphone/Dialog/DialogPlus.qml - ui/Linphone/Form/ActionBar.qml - ui/Linphone/Form/ActionButton.qml - ui/Linphone/Form/CheckBoxText.qml - ui/Linphone/Form/DarkButton.qml - ui/Linphone/Form/DropZone.qml - ui/Linphone/Form/ExclusiveButtons.qml - ui/Linphone/Form/LightButton.qml - ui/Linphone/Form/ListForm.qml - ui/Linphone/Form/SmallButton.qml - ui/Linphone/Form/TransparentComboBox.qml - ui/Linphone/Image/Icon.qml - ui/Linphone/InvertedMouseArea/InvertedMouseArea.qml - ui/Linphone/Misc/MenuEntry.qml - ui/Linphone/Popup/DropDownMenu.qml - ui/Linphone/Popup/PopupShadow.qml - ui/Linphone/qmldir - ui/Linphone/ScrollBar/ForceScrollBar.qml - ui/Linphone/SearchBox/SearchBox.qml - ui/Linphone/Select/SelectContact.qml - ui/Linphone/Styles/CollapseStyle.qml - ui/Linphone/Styles/DialogStyle.qml - ui/Linphone/Styles/PopupStyle.qml - ui/Linphone/Styles/qmldir - ui/Linphone/Styles/ScrollBarStyle.qml - ui/Linphone/Styles/SearchBoxStyle.qml - ui/Linphone/Styles/TimelineStyle.qml - ui/Linphone/Timeline/Timeline.qml - ui/Linphone/View/ScrollableListView.qml + ui/modules/Linphone/Chat/Chat.qml + ui/modules/Linphone/Chat/Event.qml + ui/modules/Linphone/Chat/IncomingMessage.qml + ui/modules/Linphone/Chat/Message.qml + ui/modules/Linphone/Chat/OutgoingMessage.qml + ui/modules/Linphone/Collapse/Collapse.qml + ui/modules/Linphone/Constants.qml + ui/modules/Linphone/Contact/Avatar.qml + ui/modules/Linphone/Contact/ContactDescription.qml + ui/modules/Linphone/Contact/Contact.qml + ui/modules/Linphone/Dialog/ConfirmDialog.qml + ui/modules/Linphone/Dialog/DialogDescription.qml + ui/modules/Linphone/Dialog/DialogPlus.qml + ui/modules/Linphone/Form/ActionBar.qml + ui/modules/Linphone/Form/ActionButton.qml + ui/modules/Linphone/Form/CheckBoxText.qml + ui/modules/Linphone/Form/DarkButton.qml + ui/modules/Linphone/Form/DropZone.qml + ui/modules/Linphone/Form/ExclusiveButtons.qml + ui/modules/Linphone/Form/LightButton.qml + ui/modules/Linphone/Form/ListForm.qml + ui/modules/Linphone/Form/SmallButton.qml + ui/modules/Linphone/Form/TransparentComboBox.qml + ui/modules/Linphone/Image/Icon.qml + ui/modules/Linphone/InvertedMouseArea/InvertedMouseArea.qml + ui/modules/Linphone/Misc/MenuEntry.qml + ui/modules/Linphone/Popup/DropDownMenu.qml + ui/modules/Linphone/Popup/PopupShadow.qml + ui/modules/Linphone/qmldir + ui/modules/Linphone/ScrollBar/ForceScrollBar.qml + ui/modules/Linphone/SearchBox/SearchBox.qml + ui/modules/Linphone/Select/SelectContact.qml + ui/modules/Linphone/Styles/CollapseStyle.qml + ui/modules/Linphone/Styles/DialogStyle.qml + ui/modules/Linphone/Styles/PopupStyle.qml + ui/modules/Linphone/Styles/qmldir + ui/modules/Linphone/Styles/ScrollBarStyle.qml + ui/modules/Linphone/Styles/SearchBoxStyle.qml + ui/modules/Linphone/Styles/TimelineStyle.qml + ui/modules/Linphone/Timeline/Timeline.qml + ui/modules/Linphone/View/ScrollableListView.qml ui/scripts/utils.js - ui/Views/MainWindow/Contact.qml - ui/Views/MainWindow/Contacts.qml - ui/Views/MainWindow/Conversation.qml - ui/Views/MainWindow/Home.qml - ui/Views/MainWindow/MainWindow.qml - ui/Views/ManageAccounts.qml - ui/Views/NewCall.qml + ui/views/MainWindow/Contact.qml + ui/views/MainWindow/Contacts.qml + ui/views/MainWindow/Conversation.qml + ui/views/MainWindow/Home.qml + ui/views/MainWindow/MainWindow.qml + ui/views/ManageAccounts.qml + ui/views/NewCall.qml diff --git a/tests/src/main.cpp b/tests/src/main.cpp index 45fe62a35..a28401278 100644 --- a/tests/src/main.cpp +++ b/tests/src/main.cpp @@ -56,9 +56,9 @@ int main (int argc, char *argv[]) { selector->setExtraSelectors(QStringList("custom")); // Set modules paths. - engine.addImportPath(":/ui/"); + engine.addImportPath(":/ui/modules"); - engine.load(QUrl("qrc:/ui/Views/MainWindow/MainWindow.qml")); + engine.load(QUrl("qrc:/ui/views/MainWindow/MainWindow.qml")); if (engine.rootObjects().isEmpty()) return EXIT_FAILURE; diff --git a/tests/ui/Linphone/Chat/Chat.qml b/tests/ui/modules/Linphone/Chat/Chat.qml similarity index 100% rename from tests/ui/Linphone/Chat/Chat.qml rename to tests/ui/modules/Linphone/Chat/Chat.qml diff --git a/tests/ui/Linphone/Chat/Event.qml b/tests/ui/modules/Linphone/Chat/Event.qml similarity index 100% rename from tests/ui/Linphone/Chat/Event.qml rename to tests/ui/modules/Linphone/Chat/Event.qml diff --git a/tests/ui/Linphone/Chat/IncomingMessage.qml b/tests/ui/modules/Linphone/Chat/IncomingMessage.qml similarity index 100% rename from tests/ui/Linphone/Chat/IncomingMessage.qml rename to tests/ui/modules/Linphone/Chat/IncomingMessage.qml diff --git a/tests/ui/Linphone/Chat/Message.qml b/tests/ui/modules/Linphone/Chat/Message.qml similarity index 100% rename from tests/ui/Linphone/Chat/Message.qml rename to tests/ui/modules/Linphone/Chat/Message.qml diff --git a/tests/ui/Linphone/Chat/OutgoingMessage.qml b/tests/ui/modules/Linphone/Chat/OutgoingMessage.qml similarity index 100% rename from tests/ui/Linphone/Chat/OutgoingMessage.qml rename to tests/ui/modules/Linphone/Chat/OutgoingMessage.qml diff --git a/tests/ui/Linphone/Collapse/Collapse.qml b/tests/ui/modules/Linphone/Collapse/Collapse.qml similarity index 100% rename from tests/ui/Linphone/Collapse/Collapse.qml rename to tests/ui/modules/Linphone/Collapse/Collapse.qml diff --git a/tests/ui/Linphone/Constants.qml b/tests/ui/modules/Linphone/Constants.qml similarity index 100% rename from tests/ui/Linphone/Constants.qml rename to tests/ui/modules/Linphone/Constants.qml diff --git a/tests/ui/Linphone/Contact/Avatar.qml b/tests/ui/modules/Linphone/Contact/Avatar.qml similarity index 100% rename from tests/ui/Linphone/Contact/Avatar.qml rename to tests/ui/modules/Linphone/Contact/Avatar.qml diff --git a/tests/ui/Linphone/Contact/Contact.qml b/tests/ui/modules/Linphone/Contact/Contact.qml similarity index 100% rename from tests/ui/Linphone/Contact/Contact.qml rename to tests/ui/modules/Linphone/Contact/Contact.qml diff --git a/tests/ui/Linphone/Contact/ContactDescription.qml b/tests/ui/modules/Linphone/Contact/ContactDescription.qml similarity index 100% rename from tests/ui/Linphone/Contact/ContactDescription.qml rename to tests/ui/modules/Linphone/Contact/ContactDescription.qml diff --git a/tests/ui/Linphone/Dialog/ConfirmDialog.qml b/tests/ui/modules/Linphone/Dialog/ConfirmDialog.qml similarity index 100% rename from tests/ui/Linphone/Dialog/ConfirmDialog.qml rename to tests/ui/modules/Linphone/Dialog/ConfirmDialog.qml diff --git a/tests/ui/Linphone/Dialog/DialogDescription.qml b/tests/ui/modules/Linphone/Dialog/DialogDescription.qml similarity index 100% rename from tests/ui/Linphone/Dialog/DialogDescription.qml rename to tests/ui/modules/Linphone/Dialog/DialogDescription.qml diff --git a/tests/ui/Linphone/Dialog/DialogPlus.qml b/tests/ui/modules/Linphone/Dialog/DialogPlus.qml similarity index 100% rename from tests/ui/Linphone/Dialog/DialogPlus.qml rename to tests/ui/modules/Linphone/Dialog/DialogPlus.qml diff --git a/tests/ui/Linphone/Form/ActionBar.qml b/tests/ui/modules/Linphone/Form/ActionBar.qml similarity index 100% rename from tests/ui/Linphone/Form/ActionBar.qml rename to tests/ui/modules/Linphone/Form/ActionBar.qml diff --git a/tests/ui/Linphone/Form/ActionButton.qml b/tests/ui/modules/Linphone/Form/ActionButton.qml similarity index 100% rename from tests/ui/Linphone/Form/ActionButton.qml rename to tests/ui/modules/Linphone/Form/ActionButton.qml diff --git a/tests/ui/Linphone/Form/CheckBoxText.qml b/tests/ui/modules/Linphone/Form/CheckBoxText.qml similarity index 100% rename from tests/ui/Linphone/Form/CheckBoxText.qml rename to tests/ui/modules/Linphone/Form/CheckBoxText.qml diff --git a/tests/ui/Linphone/Form/DarkButton.qml b/tests/ui/modules/Linphone/Form/DarkButton.qml similarity index 100% rename from tests/ui/Linphone/Form/DarkButton.qml rename to tests/ui/modules/Linphone/Form/DarkButton.qml diff --git a/tests/ui/Linphone/Form/DropZone.qml b/tests/ui/modules/Linphone/Form/DropZone.qml similarity index 100% rename from tests/ui/Linphone/Form/DropZone.qml rename to tests/ui/modules/Linphone/Form/DropZone.qml diff --git a/tests/ui/Linphone/Form/ExclusiveButtons.qml b/tests/ui/modules/Linphone/Form/ExclusiveButtons.qml similarity index 100% rename from tests/ui/Linphone/Form/ExclusiveButtons.qml rename to tests/ui/modules/Linphone/Form/ExclusiveButtons.qml diff --git a/tests/ui/Linphone/Form/LightButton.qml b/tests/ui/modules/Linphone/Form/LightButton.qml similarity index 100% rename from tests/ui/Linphone/Form/LightButton.qml rename to tests/ui/modules/Linphone/Form/LightButton.qml diff --git a/tests/ui/Linphone/Form/ListForm.qml b/tests/ui/modules/Linphone/Form/ListForm.qml similarity index 100% rename from tests/ui/Linphone/Form/ListForm.qml rename to tests/ui/modules/Linphone/Form/ListForm.qml diff --git a/tests/ui/Linphone/Form/SmallButton.qml b/tests/ui/modules/Linphone/Form/SmallButton.qml similarity index 100% rename from tests/ui/Linphone/Form/SmallButton.qml rename to tests/ui/modules/Linphone/Form/SmallButton.qml diff --git a/tests/ui/Linphone/Form/TransparentComboBox.qml b/tests/ui/modules/Linphone/Form/TransparentComboBox.qml similarity index 100% rename from tests/ui/Linphone/Form/TransparentComboBox.qml rename to tests/ui/modules/Linphone/Form/TransparentComboBox.qml diff --git a/tests/ui/Linphone/Image/Icon.qml b/tests/ui/modules/Linphone/Image/Icon.qml similarity index 100% rename from tests/ui/Linphone/Image/Icon.qml rename to tests/ui/modules/Linphone/Image/Icon.qml diff --git a/tests/ui/Linphone/InvertedMouseArea/InvertedMouseArea.qml b/tests/ui/modules/Linphone/InvertedMouseArea/InvertedMouseArea.qml similarity index 100% rename from tests/ui/Linphone/InvertedMouseArea/InvertedMouseArea.qml rename to tests/ui/modules/Linphone/InvertedMouseArea/InvertedMouseArea.qml diff --git a/tests/ui/Linphone/Misc/MenuEntry.qml b/tests/ui/modules/Linphone/Misc/MenuEntry.qml similarity index 100% rename from tests/ui/Linphone/Misc/MenuEntry.qml rename to tests/ui/modules/Linphone/Misc/MenuEntry.qml diff --git a/tests/ui/Linphone/Popup/DropDownMenu.qml b/tests/ui/modules/Linphone/Popup/DropDownMenu.qml similarity index 100% rename from tests/ui/Linphone/Popup/DropDownMenu.qml rename to tests/ui/modules/Linphone/Popup/DropDownMenu.qml diff --git a/tests/ui/Linphone/Popup/PopupShadow.qml b/tests/ui/modules/Linphone/Popup/PopupShadow.qml similarity index 100% rename from tests/ui/Linphone/Popup/PopupShadow.qml rename to tests/ui/modules/Linphone/Popup/PopupShadow.qml diff --git a/tests/ui/Linphone/ScrollBar/ForceScrollBar.qml b/tests/ui/modules/Linphone/ScrollBar/ForceScrollBar.qml similarity index 100% rename from tests/ui/Linphone/ScrollBar/ForceScrollBar.qml rename to tests/ui/modules/Linphone/ScrollBar/ForceScrollBar.qml diff --git a/tests/ui/Linphone/SearchBox/SearchBox.qml b/tests/ui/modules/Linphone/SearchBox/SearchBox.qml similarity index 100% rename from tests/ui/Linphone/SearchBox/SearchBox.qml rename to tests/ui/modules/Linphone/SearchBox/SearchBox.qml diff --git a/tests/ui/Linphone/Select/SelectContact.qml b/tests/ui/modules/Linphone/Select/SelectContact.qml similarity index 100% rename from tests/ui/Linphone/Select/SelectContact.qml rename to tests/ui/modules/Linphone/Select/SelectContact.qml diff --git a/tests/ui/Linphone/Styles/CollapseStyle.qml b/tests/ui/modules/Linphone/Styles/CollapseStyle.qml similarity index 100% rename from tests/ui/Linphone/Styles/CollapseStyle.qml rename to tests/ui/modules/Linphone/Styles/CollapseStyle.qml diff --git a/tests/ui/Linphone/Styles/DialogStyle.qml b/tests/ui/modules/Linphone/Styles/DialogStyle.qml similarity index 100% rename from tests/ui/Linphone/Styles/DialogStyle.qml rename to tests/ui/modules/Linphone/Styles/DialogStyle.qml diff --git a/tests/ui/Linphone/Styles/PopupStyle.qml b/tests/ui/modules/Linphone/Styles/PopupStyle.qml similarity index 100% rename from tests/ui/Linphone/Styles/PopupStyle.qml rename to tests/ui/modules/Linphone/Styles/PopupStyle.qml diff --git a/tests/ui/Linphone/Styles/ScrollBarStyle.qml b/tests/ui/modules/Linphone/Styles/ScrollBarStyle.qml similarity index 100% rename from tests/ui/Linphone/Styles/ScrollBarStyle.qml rename to tests/ui/modules/Linphone/Styles/ScrollBarStyle.qml diff --git a/tests/ui/Linphone/Styles/SearchBoxStyle.qml b/tests/ui/modules/Linphone/Styles/SearchBoxStyle.qml similarity index 100% rename from tests/ui/Linphone/Styles/SearchBoxStyle.qml rename to tests/ui/modules/Linphone/Styles/SearchBoxStyle.qml diff --git a/tests/ui/Linphone/Styles/TimelineStyle.qml b/tests/ui/modules/Linphone/Styles/TimelineStyle.qml similarity index 100% rename from tests/ui/Linphone/Styles/TimelineStyle.qml rename to tests/ui/modules/Linphone/Styles/TimelineStyle.qml diff --git a/tests/ui/Linphone/Styles/qmldir b/tests/ui/modules/Linphone/Styles/qmldir similarity index 100% rename from tests/ui/Linphone/Styles/qmldir rename to tests/ui/modules/Linphone/Styles/qmldir diff --git a/tests/ui/Linphone/Timeline/Timeline.qml b/tests/ui/modules/Linphone/Timeline/Timeline.qml similarity index 100% rename from tests/ui/Linphone/Timeline/Timeline.qml rename to tests/ui/modules/Linphone/Timeline/Timeline.qml diff --git a/tests/ui/Linphone/View/ScrollableListView.qml b/tests/ui/modules/Linphone/View/ScrollableListView.qml similarity index 100% rename from tests/ui/Linphone/View/ScrollableListView.qml rename to tests/ui/modules/Linphone/View/ScrollableListView.qml diff --git a/tests/ui/Linphone/qmldir b/tests/ui/modules/Linphone/qmldir similarity index 100% rename from tests/ui/Linphone/qmldir rename to tests/ui/modules/Linphone/qmldir diff --git a/tests/ui/scripts/utils.js b/tests/ui/scripts/utils.js index 27fd0858a..9b1592518 100644 --- a/tests/ui/scripts/utils.js +++ b/tests/ui/scripts/utils.js @@ -16,7 +16,7 @@ function openWindow (window, parent, options) { object = Qt.createQmlObject(window, parent) } else { var component = Qt.createComponent( - 'qrc:/ui/Views/' + window + '.qml' + 'qrc:/ui/views/' + window + '.qml' ) if (component.status !== Component.Ready) { diff --git a/tests/ui/Views/MainWindow/Contact.qml b/tests/ui/views/MainWindow/Contact.qml similarity index 100% rename from tests/ui/Views/MainWindow/Contact.qml rename to tests/ui/views/MainWindow/Contact.qml diff --git a/tests/ui/Views/MainWindow/Contacts.qml b/tests/ui/views/MainWindow/Contacts.qml similarity index 100% rename from tests/ui/Views/MainWindow/Contacts.qml rename to tests/ui/views/MainWindow/Contacts.qml diff --git a/tests/ui/Views/MainWindow/Conversation.qml b/tests/ui/views/MainWindow/Conversation.qml similarity index 100% rename from tests/ui/Views/MainWindow/Conversation.qml rename to tests/ui/views/MainWindow/Conversation.qml diff --git a/tests/ui/Views/MainWindow/Home.qml b/tests/ui/views/MainWindow/Home.qml similarity index 100% rename from tests/ui/Views/MainWindow/Home.qml rename to tests/ui/views/MainWindow/Home.qml diff --git a/tests/ui/Views/MainWindow/MainWindow.qml b/tests/ui/views/MainWindow/MainWindow.qml similarity index 98% rename from tests/ui/Views/MainWindow/MainWindow.qml rename to tests/ui/views/MainWindow/MainWindow.qml index b7997801e..c82d88930 100644 --- a/tests/ui/Views/MainWindow/MainWindow.qml +++ b/tests/ui/views/MainWindow/MainWindow.qml @@ -167,7 +167,7 @@ ApplicationWindow { Loader { Layout.fillHeight: true Layout.fillWidth: true - source: 'qrc:/ui/Views/MainWindow/Contacts.qml' + source: 'qrc:/ui/views/MainWindow/Contacts.qml' } } diff --git a/tests/ui/Views/ManageAccounts.qml b/tests/ui/views/ManageAccounts.qml similarity index 100% rename from tests/ui/Views/ManageAccounts.qml rename to tests/ui/views/ManageAccounts.qml diff --git a/tests/ui/Views/NewCall.qml b/tests/ui/views/NewCall.qml similarity index 100% rename from tests/ui/Views/NewCall.qml rename to tests/ui/views/NewCall.qml