diff --git a/tests/linphone.pro b/tests/linphone.pro index 5bb80b85b..6fb09055a 100644 --- a/tests/linphone.pro +++ b/tests/linphone.pro @@ -33,6 +33,7 @@ lupdate_only{ ui/components/scrollBar/*.qml \ ui/components/select/*.qml \ ui/components/timeline/*.qml \ + ui/style/collapse/*.qml \ ui/views/*.qml \ ui/views/mainWindow/*.qml } diff --git a/tests/resources.qrc b/tests/resources.qrc index 427e93006..801fc49fd 100644 --- a/tests/resources.qrc +++ b/tests/resources.qrc @@ -33,6 +33,8 @@ ui/components/form/DarkButton.qml ui/components/invertedMouseArea/InvertedMouseArea.qml ui/scripts/utils.js + ui/style/qmldir + ui/style/collapse/Style.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 a1d83cf3a..858db2cdd 100644 --- a/tests/src/main.cpp +++ b/tests/src/main.cpp @@ -1,5 +1,6 @@ #include +#include #include #include #include @@ -46,9 +47,15 @@ void setTrayIcon (QQmlApplicationEngine &engine) { } int main (int argc, char *argv[]) { + QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); App app(argc, argv); - QQmlApplicationEngine engine(QUrl("qrc:/ui/views/mainWindow/mainWindow.qml")); + QQmlApplicationEngine engine; + // Provide `+custom` folders for custom components. + QQmlFileSelector *selector = new QQmlFileSelector(&engine); + selector->setExtraSelectors(QStringList("custom")); + + 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 def381519..558e32593 100644 --- a/tests/ui/components/collapse/Collapse.qml +++ b/tests/ui/components/collapse/Collapse.qml @@ -3,6 +3,8 @@ import QtQuick 2.7 import 'qrc:/ui/components/form' import 'qrc:/ui/components/image' +import 'qrc:/ui/style' as Style + // =================================================================== Item { @@ -18,9 +20,7 @@ Item { ActionButton { anchors.centerIn: parent - background: Rectangle { - color: 'transparent' - } + background: Style.CollapseStyle.background icon: 'collapse' iconSize: 32 id: button diff --git a/tests/ui/components/invertedMouseArea/InvertedMouseArea.qml b/tests/ui/components/invertedMouseArea/InvertedMouseArea.qml index cf2c84417..ef9df855e 100644 --- a/tests/ui/components/invertedMouseArea/InvertedMouseArea.qml +++ b/tests/ui/components/invertedMouseArea/InvertedMouseArea.qml @@ -17,7 +17,6 @@ Item { } _mouseArea.parent = (function () { - // Search root. var root = item while (root.parent != null) {