diff --git a/linphone-desktop/resources.qrc b/linphone-desktop/resources.qrc index 8e30c3fd4..ee862fa8b 100644 --- a/linphone-desktop/resources.qrc +++ b/linphone-desktop/resources.qrc @@ -312,11 +312,11 @@ ui/scripts/Utils/utils.js ui/views/App/Calls/AbstractStartingCall.qml ui/views/App/Calls/CallsWindow.qml + ui/views/App/Calls/IncallFullscreenWindow.qml ui/views/App/Calls/Incall.js ui/views/App/Calls/Incall.qml ui/views/App/Calls/IncomingCall.qml ui/views/App/Calls/OutgoingCall.qml - ui/views/App/IncallFullscreenWindow.qml ui/views/App/Main/Assistant/AssistantAbstractView.qml ui/views/App/Main/Assistant/AssistantCreateLinphoneSipAccount.qml ui/views/App/Main/Assistant/AssistantFetchRemoteConfiguration.qml @@ -335,7 +335,6 @@ ui/views/App/Main/MainWindowMenuBar.qml ui/views/App/Main/MainWindow.qml ui/views/App/Main/ManageAccounts.qml - ui/views/App/qmldir ui/views/App/Settings/SettingsAudio.qml ui/views/App/Settings/SettingsCallsChat.qml ui/views/App/Settings/SettingsNetwork.qml diff --git a/linphone-desktop/ui/modules/Common/Window/Window.js b/linphone-desktop/ui/modules/Common/Window/Window.js index 4418adedf..4021281fa 100644 --- a/linphone-desktop/ui/modules/Common/Window/Window.js +++ b/linphone-desktop/ui/modules/Common/Window/Window.js @@ -11,12 +11,12 @@ // at item destruction. // // The exit status handler is optional. -function attachVirtualWindow (object, properties, exitStatusHandler) { +function attachVirtualWindow (component, properties, exitStatusHandler) { if (virtualWindow.visible) { return } - var object = Utils.createObject(object, null, { + var object = Utils.createObject(component, null, { properties: properties }) diff --git a/linphone-desktop/ui/views/App/Calls/Incall.js b/linphone-desktop/ui/views/App/Calls/Incall.js index 7bab3e86a..d932bd10c 100644 --- a/linphone-desktop/ui/views/App/Calls/Incall.js +++ b/linphone-desktop/ui/views/App/Calls/Incall.js @@ -66,7 +66,7 @@ function showFullscreen () { return } - incall._fullscreen = Utils.openWindow('IncallFullscreenWindow', incall, { + incall._fullscreen = Utils.openWindow(Qt.resolvedUrl('IncallFullscreenWindow.qml'), incall, { properties: { call: incall.call, callsWindow: incall diff --git a/linphone-desktop/ui/views/App/IncallFullscreenWindow.qml b/linphone-desktop/ui/views/App/Calls/IncallFullscreenWindow.qml similarity index 100% rename from linphone-desktop/ui/views/App/IncallFullscreenWindow.qml rename to linphone-desktop/ui/views/App/Calls/IncallFullscreenWindow.qml diff --git a/linphone-desktop/ui/views/App/qmldir b/linphone-desktop/ui/views/App/qmldir deleted file mode 100644 index 22a4ef605..000000000 --- a/linphone-desktop/ui/views/App/qmldir +++ /dev/null @@ -1,9 +0,0 @@ -# ============================================================================== -# Linphone's views. -# ============================================================================== - -module App - -# Views ------------------------------------------------------------------------ - -IncallFullscreenWindow 1.0 IncallFullscreenWindow.qml