diff --git a/storybook/main.qml b/storybook/main.qml index c09ae21e5f..0c136e9ecc 100644 --- a/storybook/main.qml +++ b/storybook/main.qml @@ -5,8 +5,6 @@ import QtQuick.Layouts 1.15 import Qt.labs.settings 1.0 -import StatusQ 0.1 // https://github.com/status-im/status-desktop/issues/10218 - import StatusQ.Core.Theme 0.1 import Storybook 1.0 diff --git a/storybook/qmlTests/tests/tst_DAppsWorkflow.qml b/storybook/qmlTests/tests/tst_DAppsWorkflow.qml index 9ab0cb04ff..47fd6d79f6 100644 --- a/storybook/qmlTests/tests/tst_DAppsWorkflow.qml +++ b/storybook/qmlTests/tests/tst_DAppsWorkflow.qml @@ -3,7 +3,6 @@ import QtQuick 2.15 import QtTest 1.15 import "helpers/wallet_connect.js" as Testing -import StatusQ 0.1 // See #10218 import StatusQ.Core.Utils 0.1 import QtQuick.Controls 2.15 diff --git a/storybook/qmlTests/tests/tst_DerivationPathInput.qml b/storybook/qmlTests/tests/tst_DerivationPathInput.qml index 6159609091..4be8b0be1d 100644 --- a/storybook/qmlTests/tests/tst_DerivationPathInput.qml +++ b/storybook/qmlTests/tests/tst_DerivationPathInput.qml @@ -3,8 +3,6 @@ import QtQuick.Controls 2.14 import QtQml 2.14 import QtTest 1.0 -import StatusQ 0.1 // https://github.com/status-im/status-desktop/issues/10218 - import shared.popups.addaccount.panels 1.0 import shared.popups.addaccount.panels.DerivationPathInput 1.0 diff --git a/storybook/qmlTests/tests/tst_StatusChatInput.qml b/storybook/qmlTests/tests/tst_StatusChatInput.qml index 8f359f49e3..b44a35ea83 100644 --- a/storybook/qmlTests/tests/tst_StatusChatInput.qml +++ b/storybook/qmlTests/tests/tst_StatusChatInput.qml @@ -3,7 +3,6 @@ import QtQuick.Controls 2.14 import QtQml 2.14 import QtTest 1.0 -import StatusQ 0.1 // https://github.com/status-im/status-desktop/issues/10218 import StatusQ.Core.Utils 0.1 as SQUtils import utils 1.0 diff --git a/storybook/qmlTests/tests/tst_SwapModal.qml b/storybook/qmlTests/tests/tst_SwapModal.qml index 602f121dcc..b889db5f4e 100644 --- a/storybook/qmlTests/tests/tst_SwapModal.qml +++ b/storybook/qmlTests/tests/tst_SwapModal.qml @@ -1,7 +1,6 @@ import QtQuick 2.15 import QtTest 1.15 -import StatusQ 0.1 // See #10218 import StatusQ.Core 0.1 import StatusQ.Core.Utils 0.1 as SQUtils import StatusQ.Core.Theme 0.1 diff --git a/ui/StatusQ/sandbox/main.qml b/ui/StatusQ/sandbox/main.qml index e7da65b63d..5ebe2d9cf7 100644 --- a/ui/StatusQ/sandbox/main.qml +++ b/ui/StatusQ/sandbox/main.qml @@ -7,8 +7,7 @@ import Qt.labs.settings 1.0 import QtQml.Models 2.15 import QtMultimedia 5.15 -import StatusQ 0.1 // https://github.com/status-im/status-desktop/issues/10218 - +import StatusQ 0.1 import StatusQ.Core 0.1 import StatusQ.Core.Theme 0.1 import StatusQ.Controls 0.1 diff --git a/ui/StatusQ/tests/TestComponents/tst_StatusImageCropPanel.qml b/ui/StatusQ/tests/TestComponents/tst_StatusImageCropPanel.qml index ddd80cc6f9..4d02ab16e1 100644 --- a/ui/StatusQ/tests/TestComponents/tst_StatusImageCropPanel.qml +++ b/ui/StatusQ/tests/TestComponents/tst_StatusImageCropPanel.qml @@ -1,11 +1,8 @@ -import QtQuick 2.0 -import QtTest 1.0 - -import StatusQ 0.1 // https://github.com/status-im/status-desktop/issues/10218 +import QtQuick 2.15 +import QtTest 1.15 import StatusQ.Components 0.1 import StatusQ.Controls 0.1 - import StatusQ.TestHelpers 0.1 Item { diff --git a/ui/StatusQ/tests/TestComponents/tst_WebEngineLoader.qml b/ui/StatusQ/tests/TestComponents/tst_WebEngineLoader.qml index 8555df8805..5eb2b2b998 100644 --- a/ui/StatusQ/tests/TestComponents/tst_WebEngineLoader.qml +++ b/ui/StatusQ/tests/TestComponents/tst_WebEngineLoader.qml @@ -1,13 +1,10 @@ import QtQuick 2.15 -import QtTest 1.0 +import QtTest 1.15 import QtWebEngine 1.10 import QtWebChannel 1.15 -import StatusQ 0.1 // https://github.com/status-im/status-desktop/issues/10218 - import StatusQ.Components 0.1 - import StatusQ.TestHelpers 0.1 TestCase { diff --git a/ui/main.qml b/ui/main.qml index 74fa441f30..a67369d933 100644 --- a/ui/main.qml +++ b/ui/main.qml @@ -16,7 +16,7 @@ import shared.stores 1.0 import mainui 1.0 import AppLayouts.Onboarding 1.0 -import StatusQ 0.1 // Force import StatusQ plugin to load all StatusQ resources +import StatusQ 0.1 import StatusQ.Core.Theme 0.1 StatusWindow {