diff --git a/tests/resources.qrc b/tests/resources.qrc
index 165e35da2..e26db59b3 100644
--- a/tests/resources.qrc
+++ b/tests/resources.qrc
@@ -35,16 +35,16 @@
ui/components/form/DarkButton.qml
ui/components/invertedMouseArea/InvertedMouseArea.qml
ui/scripts/utils.js
- ui/style/components/qmldir
- ui/style/components/DialogStyle.qml
- ui/style/components/ScrollBarStyle.qml
- ui/style/components/TimelineStyle.qml
- ui/style/components/SearchBoxStyle.qml
- ui/style/components/CollapseStyle.qml
- ui/style/components/PopupStyle.qml
- ui/style/global/qmldir
- ui/style/global/Colors.qml
- ui/style/global/Constants.qml
+ ui/style/ComponentsStyle/qmldir
+ ui/style/ComponentsStyle/DialogStyle.qml
+ ui/style/ComponentsStyle/ScrollBarStyle.qml
+ ui/style/ComponentsStyle/TimelineStyle.qml
+ ui/style/ComponentsStyle/SearchBoxStyle.qml
+ ui/style/ComponentsStyle/CollapseStyle.qml
+ ui/style/ComponentsStyle/PopupStyle.qml
+ ui/style/AppStyle/qmldir
+ ui/style/AppStyle/Colors.qml
+ ui/style/AppStyle/Constants.qml
ui/views/newCall.qml
ui/views/manageAccounts.qml
ui/views/mainWindow/mainWindow.qml
diff --git a/tests/src/main.cpp b/tests/src/main.cpp
index 858db2cdd..54f306c79 100644
--- a/tests/src/main.cpp
+++ b/tests/src/main.cpp
@@ -55,6 +55,9 @@ int main (int argc, char *argv[]) {
QQmlFileSelector *selector = new QQmlFileSelector(&engine);
selector->setExtraSelectors(QStringList("custom"));
+ // Set modules paths.
+ engine.addImportPath(":/ui/style");
+
engine.load(QUrl("qrc:/ui/views/mainWindow/mainWindow.qml"));
if (engine.rootObjects().isEmpty())
return EXIT_FAILURE;
diff --git a/tests/ui/components/collapse/Collapse.qml b/tests/ui/components/collapse/Collapse.qml
index 730e0a571..7c2d97dab 100644
--- a/tests/ui/components/collapse/Collapse.qml
+++ b/tests/ui/components/collapse/Collapse.qml
@@ -1,8 +1,8 @@
import QtQuick 2.7
-import 'qrc:/ui/components/form'
+import ComponentsStyle 1.0
-import 'qrc:/ui/style/components'
+import 'qrc:/ui/components/form'
// ===================================================================
// A simple component to build collapsed item.
diff --git a/tests/ui/components/dialog/ConfirmDialog.qml b/tests/ui/components/dialog/ConfirmDialog.qml
index 2990f5cb5..29cfcbecb 100644
--- a/tests/ui/components/dialog/ConfirmDialog.qml
+++ b/tests/ui/components/dialog/ConfirmDialog.qml
@@ -1,8 +1,8 @@
import QtQuick 2.7
-import 'qrc:/ui/components/form'
+import ComponentsStyle 1.0
-import 'qrc:/ui/style/components'
+import 'qrc:/ui/components/form'
// ===================================================================
// A dialog with OK/Cancel buttons.
diff --git a/tests/ui/components/dialog/DialogDescription.qml b/tests/ui/components/dialog/DialogDescription.qml
index 1e6be309f..b642ebe21 100644
--- a/tests/ui/components/dialog/DialogDescription.qml
+++ b/tests/ui/components/dialog/DialogDescription.qml
@@ -1,6 +1,6 @@
import QtQuick 2.7
-import 'qrc:/ui/style/components'
+import ComponentsStyle 1.0
// ===================================================================
// Description content used by dialogs.
diff --git a/tests/ui/components/dialog/DialogPlus.qml b/tests/ui/components/dialog/DialogPlus.qml
index 08680078f..c199b102d 100644
--- a/tests/ui/components/dialog/DialogPlus.qml
+++ b/tests/ui/components/dialog/DialogPlus.qml
@@ -2,7 +2,7 @@ import QtQuick 2.7
import QtQuick.Layouts 1.3
import QtQuick.Window 2.2
-import 'qrc:/ui/style/components'
+import ComponentsStyle 1.0
// ===================================================================
// Helper to build quickly dialogs.
diff --git a/tests/ui/components/invertedMouseArea/InvertedMouseArea.qml b/tests/ui/components/invertedMouseArea/InvertedMouseArea.qml
index 9215d5447..d3d132cc6 100644
--- a/tests/ui/components/invertedMouseArea/InvertedMouseArea.qml
+++ b/tests/ui/components/invertedMouseArea/InvertedMouseArea.qml
@@ -1,6 +1,6 @@
import QtQuick 2.7
-import 'qrc:/ui/style/global'
+import AppStyle 1.0
// ===================================================================
// Helper to handle button click outside a component.
diff --git a/tests/ui/components/popup/PopupShadow.qml b/tests/ui/components/popup/PopupShadow.qml
index f48942987..76dcef4d4 100644
--- a/tests/ui/components/popup/PopupShadow.qml
+++ b/tests/ui/components/popup/PopupShadow.qml
@@ -1,6 +1,6 @@
import QtGraphicalEffects 1.0
-import 'qrc:/ui/style/components'
+import ComponentsStyle 1.0
// ===================================================================
diff --git a/tests/ui/components/scrollBar/ForceScrollBar.qml b/tests/ui/components/scrollBar/ForceScrollBar.qml
index aff1a91f4..84720fce3 100644
--- a/tests/ui/components/scrollBar/ForceScrollBar.qml
+++ b/tests/ui/components/scrollBar/ForceScrollBar.qml
@@ -1,7 +1,7 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
-import 'qrc:/ui/style/components'
+import ComponentsStyle 1.0
// ===================================================================
diff --git a/tests/ui/components/searchBox/SearchBox.qml b/tests/ui/components/searchBox/SearchBox.qml
index a494442f6..e61e8bb58 100644
--- a/tests/ui/components/searchBox/SearchBox.qml
+++ b/tests/ui/components/searchBox/SearchBox.qml
@@ -1,12 +1,12 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
+import AppStyle 1.0
+import ComponentsStyle 1.0
+
import 'qrc:/ui/components/invertedMouseArea'
import 'qrc:/ui/components/popup'
-import 'qrc:/ui/style/components'
-import 'qrc:/ui/style/global'
-
// ===================================================================
Item {
diff --git a/tests/ui/components/timeline/Timeline.qml b/tests/ui/components/timeline/Timeline.qml
index 10bd9afb6..e4f57fb27 100644
--- a/tests/ui/components/timeline/Timeline.qml
+++ b/tests/ui/components/timeline/Timeline.qml
@@ -1,12 +1,12 @@
import QtQuick 2.7
import QtQuick.Layouts 1.3
+import ComponentsStyle 1.0
+
import 'qrc:/ui/components/contact'
import 'qrc:/ui/components/image'
import 'qrc:/ui/components/view'
-import 'qrc:/ui/style/components'
-
// ===================================================================
ColumnLayout {
diff --git a/tests/ui/style/global/Colors.qml b/tests/ui/style/AppStyle/Colors.qml
similarity index 100%
rename from tests/ui/style/global/Colors.qml
rename to tests/ui/style/AppStyle/Colors.qml
diff --git a/tests/ui/style/global/Constants.qml b/tests/ui/style/AppStyle/Constants.qml
similarity index 100%
rename from tests/ui/style/global/Constants.qml
rename to tests/ui/style/AppStyle/Constants.qml
diff --git a/tests/ui/style/global/qmldir b/tests/ui/style/AppStyle/qmldir
similarity index 87%
rename from tests/ui/style/global/qmldir
rename to tests/ui/style/AppStyle/qmldir
index 969871dfe..1a89ac421 100644
--- a/tests/ui/style/global/qmldir
+++ b/tests/ui/style/AppStyle/qmldir
@@ -1,6 +1,6 @@
# See: https://wiki.qt.io/Qml_Styling
-module Style
+module AppStyle
singleton Colors 1.0 Colors.qml
singleton Constants 1.0 Constants.qml
diff --git a/tests/ui/style/components/CollapseStyle.qml b/tests/ui/style/ComponentsStyle/CollapseStyle.qml
similarity index 100%
rename from tests/ui/style/components/CollapseStyle.qml
rename to tests/ui/style/ComponentsStyle/CollapseStyle.qml
diff --git a/tests/ui/style/components/DialogStyle.qml b/tests/ui/style/ComponentsStyle/DialogStyle.qml
similarity index 100%
rename from tests/ui/style/components/DialogStyle.qml
rename to tests/ui/style/ComponentsStyle/DialogStyle.qml
diff --git a/tests/ui/style/components/PopupStyle.qml b/tests/ui/style/ComponentsStyle/PopupStyle.qml
similarity index 90%
rename from tests/ui/style/components/PopupStyle.qml
rename to tests/ui/style/ComponentsStyle/PopupStyle.qml
index 38887d68d..d7c55cc5c 100644
--- a/tests/ui/style/components/PopupStyle.qml
+++ b/tests/ui/style/ComponentsStyle/PopupStyle.qml
@@ -1,7 +1,7 @@
pragma Singleton
import QtQuick 2.7
-import 'qrc:/ui/style/global'
+import AppStyle 1.0
QtObject {
property QtObject shadow: QtObject {
diff --git a/tests/ui/style/components/ScrollBarStyle.qml b/tests/ui/style/ComponentsStyle/ScrollBarStyle.qml
similarity index 91%
rename from tests/ui/style/components/ScrollBarStyle.qml
rename to tests/ui/style/ComponentsStyle/ScrollBarStyle.qml
index 14cd4b48d..9fc7f62f6 100644
--- a/tests/ui/style/components/ScrollBarStyle.qml
+++ b/tests/ui/style/ComponentsStyle/ScrollBarStyle.qml
@@ -1,7 +1,7 @@
pragma Singleton
import QtQuick 2.7
-import 'qrc:/ui/style/global'
+import AppStyle 1.0
QtObject {
property string color: Colors.c
diff --git a/tests/ui/style/components/SearchBoxStyle.qml b/tests/ui/style/ComponentsStyle/SearchBoxStyle.qml
similarity index 86%
rename from tests/ui/style/components/SearchBoxStyle.qml
rename to tests/ui/style/ComponentsStyle/SearchBoxStyle.qml
index 4d9894d71..a41f7b93d 100644
--- a/tests/ui/style/components/SearchBoxStyle.qml
+++ b/tests/ui/style/ComponentsStyle/SearchBoxStyle.qml
@@ -1,7 +1,7 @@
pragma Singleton
import QtQuick 2.7
-import 'qrc:/ui/style/global'
+import AppStyle 1.0
QtObject {
property string shadowColor: Colors.a
diff --git a/tests/ui/style/components/TimelineStyle.qml b/tests/ui/style/ComponentsStyle/TimelineStyle.qml
similarity index 94%
rename from tests/ui/style/components/TimelineStyle.qml
rename to tests/ui/style/ComponentsStyle/TimelineStyle.qml
index a72e2119b..b3655d1ed 100644
--- a/tests/ui/style/components/TimelineStyle.qml
+++ b/tests/ui/style/ComponentsStyle/TimelineStyle.qml
@@ -1,7 +1,7 @@
pragma Singleton
import QtQuick 2.7
-import 'qrc:/ui/style/global'
+import AppStyle 1.0
QtObject {
property QtObject legend: QtObject {
diff --git a/tests/ui/style/components/qmldir b/tests/ui/style/ComponentsStyle/qmldir
similarity index 93%
rename from tests/ui/style/components/qmldir
rename to tests/ui/style/ComponentsStyle/qmldir
index bcc1be0f1..487165d11 100644
--- a/tests/ui/style/components/qmldir
+++ b/tests/ui/style/ComponentsStyle/qmldir
@@ -1,6 +1,6 @@
# See: https://wiki.qt.io/Qml_Styling
-module Style
+module ComponentsStyle
singleton CollapseStyle 1.0 CollapseStyle.qml
singleton DialogStyle 1.0 DialogStyle.qml