summaryrefslogtreecommitdiffstats
path: root/src/window-lib
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@qt.io>2023-09-25 21:44:43 +0200
committerRobert Griebl <robert.griebl@qt.io>2023-11-06 15:17:37 +0100
commitca4215d582b87686cf9aafe0f51c9c98db96bb8c (patch)
treeffb61926782f1cd9447cac06265d1dcb26593c7a /src/window-lib
parent25e73aae0935c87e69d89371d2018f8bbfa1e3f6 (diff)
Add an ApplicationManagerWindow attached object
This makes it easier to always reach your AMW instance, especially now in multi-process mode, where Window.window will NOT be the AMW anymore. The attached object is modelled after the Window attached one, so activeFocusItem was added to both AMW and AMWAttached. Also fixed the most obvious of the non-implemented in-process AMW properties. This needs a follow-up commit to completely fix that though. Change-Id: Icac9bfb2994ca6250f0056e142bd59c8ef4b469a Task-number: QTBUG-103266 Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>
Diffstat (limited to 'src/window-lib')
-rw-r--r--src/window-lib/windowmanager.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/window-lib/windowmanager.cpp b/src/window-lib/windowmanager.cpp
index 5911da01..7c4beee2 100644
--- a/src/window-lib/windowmanager.cpp
+++ b/src/window-lib/windowmanager.cpp
@@ -229,6 +229,10 @@ WindowManager *WindowManager::createInstance(QQmlEngine *qmlEngine, const QStrin
ApplicationManagerWindowImpl::setFactory([](ApplicationManagerWindow *window) {
return new QmlInProcApplicationManagerWindowImpl(window);
});
+ ApplicationManagerWindowAttachedImpl::setFactory([](ApplicationManagerWindowAttached *windowAttached,
+ QQuickItem *attacheeItem) {
+ return new QmlInProcApplicationManagerWindowAttachedImpl(windowAttached, attacheeItem);
+ });
SystemFrameTimerImpl::setFactory([](FrameTimer *frameTimer) {
return new SystemFrameTimerImpl(frameTimer);
});