diff --git a/src/app/commoncomponents/DualPaneView.qml b/src/app/commoncomponents/DualPaneView.qml index a4dc8ce81071fd917315eb4b683b14ea3dc879f7..a2405686a4eed77a4a0171fecb670a45099d84bc 100644 --- a/src/app/commoncomponents/DualPaneView.qml +++ b/src/app/commoncomponents/DualPaneView.qml @@ -38,8 +38,8 @@ BaseView { property bool isSinglePane onPresented: { - leftPaneItem.parent = leftPane - rightPaneItem.parent = rightPane + if (leftPaneItem) leftPaneItem.parent = leftPane + if (rightPaneItem) rightPaneItem.parent = rightPane splitView.restoreSplitViewState() diff --git a/tests/qml/resources.qrc b/tests/qml/resources.qrc index 9962a13a6a5d0935e21e67a31f46137bfe975142..97f685ad3c8d07ddc291f4278a85e7dff2be1bf0 100644 --- a/tests/qml/resources.qrc +++ b/tests/qml/resources.qrc @@ -2,11 +2,9 @@ <qresource prefix="/"> <file>src/tst_LocalAccount.qml</file> <file>src/tst_WizardView.qml</file> - <!--<file>src/tst_PresenceIndicator.qml</file> - <file>src/tst_ChatViewFooter.qml</file> + <file>src/tst_NewSwarmPage.qml</file> <file>src/resources/gif_test.gif</file> <file>src/resources/gz_test.gz</file> <file>src/resources/png_test.png</file> - <file>src/tst_FilesToSendContainer.qml</file>--> </qresource> </RCC> diff --git a/tests/qml/src/tst_NewSwarmPage.qml b/tests/qml/src/tst_NewSwarmPage.qml index bf0d9e89714f83c243b7e837b846a00a18b4f098..bb8af020e11db0bf2801f612b246f276eb8308e9 100644 --- a/tests/qml/src/tst_NewSwarmPage.qml +++ b/tests/qml/src/tst_NewSwarmPage.qml @@ -24,6 +24,7 @@ import QtTest import net.jami.Models 1.1 import net.jami.Constants 1.1 +import "../../../src/app/" import "../../../src/app/mainview/components" ColumnLayout { @@ -37,6 +38,11 @@ ColumnLayout { NewSwarmPage { id: uut + property ViewManager viewManager: ViewManager {} + property ViewCoordinator viewCoordinator: ViewCoordinator { + viewManager: uut.viewManager + } + Layout.alignment: Qt.AlignHCenter Layout.preferredWidth: root.width Layout.maximumWidth: JamiTheme.chatViewMaximumWidth diff --git a/tests/qml/src/tst_WizardView.qml b/tests/qml/src/tst_WizardView.qml index fcdbb528fe55df818f4904a9e6d49d5f96a7abd9..367b407d522b80f59233e5f149dee657d7004208 100644 --- a/tests/qml/src/tst_WizardView.qml +++ b/tests/qml/src/tst_WizardView.qml @@ -24,12 +24,18 @@ import net.jami.Models 1.1 import net.jami.Constants 1.1 import net.jami.Enums 1.1 +import "../../../src/app/" import "../../../src/app/wizardview" import "../../../src/app/commoncomponents" WizardView { id: uut + property ViewManager viewManager: ViewManager {} + property ViewCoordinator viewCoordinator: ViewCoordinator { + viewManager: uut.viewManager + } + function clearSignalSpy() { spyAccountIsReady.clear() spyAccountIsRemoved.clear() diff --git a/tests/qml/src/tst_ChatViewFooter.qml b/tests/qml/to_fix/tst_ChatViewFooter.qml similarity index 100% rename from tests/qml/src/tst_ChatViewFooter.qml rename to tests/qml/to_fix/tst_ChatViewFooter.qml