diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2023-08-09 17:18:21 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2023-08-10 17:55:40 +0000 |
| commit | ae165f60d52dc6629f5ef0afcb9cec4d754a1fb0 (patch) | |
| tree | 8680ca77cef17ab5609103e9e21dd16e4d97812b /src/quick/items/qquickwindow.cpp | |
| parent | e8769ec5d01493b63d791403202e3b55bfc77ca2 (diff) | |
Merge variables for tracking component completion for QQuickWindow
The QQuickWindowPrivate::componentCompleted member was not used for
anything, while the QQuickWindowQmlImplPrivate::complete member was
doing the completion tracking.
The variable is now named componentComplete, to match QQuickItem,
and lives in the QQuickWindowPrivate base class.
As seems customary for other classes, the variable is default
initialized to true, and then reset to false in classBegin(),
and then to true in the componentComplete() callback.
Pick-to: 6.6
Change-Id: I77e5864d1c21deaf87d9098a149d590cfc160e4d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/quick/items/qquickwindow.cpp')
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 92e2cde77a..3c2e497018 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -675,7 +675,7 @@ QQuickWindowPrivate::QQuickWindowPrivate() , clearColor(Qt::white) , persistentGraphics(true) , persistentSceneGraph(true) - , componentCompleted(true) + , componentComplete(true) , inDestructor(false) , incubationController(nullptr) , hasActiveSwapchain(false) |