diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 16:00:07 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 16:00:07 +0200 |
| commit | 19ed7973a311a8d42d3a558bb551230e902ce9b9 (patch) | |
| tree | 9832c0cc796722f85579e25fd50cc38b65e6ef6c /src/quick/items/qquickloader.cpp | |
| parent | f5701f0def37fcc0c2b38ae9552eb3a896a34687 (diff) | |
| parent | a5635345175e667601c8b6a344508c4d4ebb0f9d (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into tqtc/lts-5.15-opensourcev5.15.9-lts-lgpl
Change-Id: I91d2b178e7111d0802ea973bccf230b264c30c96
Diffstat (limited to 'src/quick/items/qquickloader.cpp')
| -rw-r--r-- | src/quick/items/qquickloader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp index 7fbe66fdda..00ac3de9e7 100644 --- a/src/quick/items/qquickloader.cpp +++ b/src/quick/items/qquickloader.cpp @@ -946,7 +946,7 @@ void QQuickLoaderPrivate::_q_updateSize(bool loaderGeometryChanged) } /*! - \qmlproperty object QtQuick::Loader::item + \qmlproperty QtObject QtQuick::Loader::item This property holds the top-level object that is currently loaded. Since \c {QtQuick 2.0}, Loader can load any object type. |