diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-12-15 16:14:22 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-12-15 16:14:22 +0200 |
| commit | b58ec3b086518da5aa573f99426235854c23e35f (patch) | |
| tree | 861a9935d8f1cdba2fdca546836a351736dbddbf /src/quick/items/qquickwindow.cpp | |
| parent | 4826f86e274f1b29bd769e6790824f9e62a40f62 (diff) | |
| parent | 22032227d16c39211e2ebceef97d21f4d89c7c87 (diff) | |
Merge tag 'v6.5.8-lts-lgpl' into 6.56.5
Qt 6.5.8-lts-lgpl release
Diffstat (limited to 'src/quick/items/qquickwindow.cpp')
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 9de90f8d82..d5d5454f22 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -826,13 +826,17 @@ void QQuickWindow::handleApplicationStateChanged(Qt::ApplicationState state) QQmlListProperty<QObject> QQuickWindowPrivate::data() { - return QQmlListProperty<QObject>(q_func(), nullptr, - QQuickWindowPrivate::data_append, - QQuickWindowPrivate::data_count, - QQuickWindowPrivate::data_at, - QQuickWindowPrivate::data_clear, - QQuickWindowPrivate::data_replace, - QQuickWindowPrivate::data_removeLast); + QQmlListProperty<QObject> ret; + + ret.object = q_func(); + ret.append = QQuickWindowPrivate::data_append; + ret.count = QQuickWindowPrivate::data_count; + ret.at = QQuickWindowPrivate::data_at; + ret.clear = QQuickWindowPrivate::data_clear; + // replace is not supported by QQuickItem. Don't synthesize it. + ret.removeLast = QQuickWindowPrivate::data_removeLast; + + return ret; } void QQuickWindowPrivate::dirtyItem(QQuickItem *) @@ -1840,13 +1844,6 @@ void QQuickWindowPrivate::data_clear(QQmlListProperty<QObject> *property) itemProperty.clear(&itemProperty); } -void QQuickWindowPrivate::data_replace(QQmlListProperty<QObject> *property, qsizetype i, QObject *o) -{ - QQuickWindow *win = static_cast<QQuickWindow*>(property->object); - QQmlListProperty<QObject> itemProperty = QQuickItemPrivate::get(win->contentItem())->data(); - itemProperty.replace(&itemProperty, i, o); -} - void QQuickWindowPrivate::data_removeLast(QQmlListProperty<QObject> *property) { QQuickWindow *win = static_cast<QQuickWindow*>(property->object); @@ -4166,8 +4163,8 @@ void QQuickWindow::setGraphicsConfiguration(const QQuickGraphicsConfiguration &c } /*! - \return the QQuickGraphicsDevice passed to setGraphicsDevice(), or a - default constructed one otherwise + \return the QQuickGraphicsConfiguration passed to + setGraphicsConfiguration(), or a default constructed one otherwise. \since 6.0 |