diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2023-08-22 16:13:49 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2023-09-29 00:28:39 +0200 |
commit | cacb0ea963ae70f909246c1c1b639f2f78a3a003 (patch) | |
tree | 5e30ea3ac646621fca33b219bb847500aec8b87c /src/quick/items | |
parent | 9baf823ec239789d20befa91e5c19e0c73f277df (diff) |
Clarify relation between transient parent and child in debug logging
It's also now clearer that it's a synchronous modification of the
relationship.
Change-Id: Ie9c72c7d195b124f842cc1df15c51cb7b4ff99e6
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick/items')
-rw-r--r-- | src/quick/items/qquickitem.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquickitemsmodule.cpp | 4 | ||||
-rw-r--r-- | src/quick/items/qquickloader.cpp | 4 | ||||
-rw-r--r-- | src/quick/items/qquickwindow.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 0220218788..b7d879cbb8 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -3262,7 +3262,7 @@ void QQuickItemPrivate::data_append(QQmlListProperty<QObject> *prop, QObject *o) } if (itemWindow) { - qCDebug(lcTransient) << quickWindow << "is transient for" << itemWindow; + qCDebug(lcTransient) << "Setting" << itemWindow << "as transient parent of" << quickWindow; quickWindow->setTransientParent(itemWindow); } else { QObject::connect(item, &QQuickItem::windowChanged, diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp index 0b1407d79b..8b4fba31d4 100644 --- a/src/quick/items/qquickitemsmodule.cpp +++ b/src/quick/items/qquickitemsmodule.cpp @@ -105,7 +105,7 @@ static QQmlPrivate::AutoParentResult qquickitem_autoParent(QObject *obj, QObject QQuickWindow *win = qmlobject_cast<QQuickWindow *>(obj); if (win) { // A Window inside an Item should be transient for that item's window - qCDebug(lcTransient) << win << "is transient for" << parentItem->window(); + qCDebug(lcTransient) << "Setting" << parentItem->window() << "as transient parent of" << win; win->setTransientParent(parentItem->window()); return QQmlPrivate::Parented; } @@ -119,7 +119,7 @@ static QQmlPrivate::AutoParentResult qquickitem_autoParent(QObject *obj, QObject QQuickWindow *win = qmlobject_cast<QQuickWindow *>(obj); if (win) { // A Window inside a Window should be transient for it - qCDebug(lcTransient) << win << "is transient for" << parentWindow; + qCDebug(lcTransient) << "Setting" << parentWindow << "as transient parent of" << win; win->setTransientParent(parentWindow); return QQmlPrivate::Parented; } else if (QQuickItem *item = qmlobject_cast<QQuickItem *>(obj)) { diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp index 128b0b348f..572f484ec5 100644 --- a/src/quick/items/qquickloader.cpp +++ b/src/quick/items/qquickloader.cpp @@ -676,7 +676,7 @@ void QQuickLoaderPrivate::incubatorStateChanged(QQmlIncubator::Status status) if (!item) { QQuickWindow *window = qmlobject_cast<QQuickWindow*>(object); if (window) { - qCDebug(lcTransient) << window << "is transient for" << q->window(); + qCDebug(lcTransient) << "Setting" << q->window() << "as transient parent of" << window; window->setTransientParent(q->window()); } } @@ -808,7 +808,7 @@ void QQuickLoader::itemChange(QQuickItem::ItemChange change, const QQuickItem::I case ItemSceneChange: { QQuickWindow *loadedWindow = qmlobject_cast<QQuickWindow *>(item()); if (loadedWindow) { - qCDebug(lcTransient) << loadedWindow << "is transient for" << value.window; + qCDebug(lcTransient) << "Setting" << value.window << "as transient parent of" << loadedWindow; loadedWindow->setTransientParent(value.window); } break; diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 6d1ee36bca..7cb7d1644b 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -1762,7 +1762,7 @@ void QQuickWindowPrivate::data_append(QQmlListProperty<QObject> *property, QObje return; QQuickWindow *that = static_cast<QQuickWindow *>(property->object); if (QQuickWindow *window = qmlobject_cast<QQuickWindow *>(o)) { - qCDebug(lcTransient) << window << "is transient for" << that; + qCDebug(lcTransient) << "Setting" << that << "as transient parent of" << window; window->setTransientParent(that); } QQmlListProperty<QObject> itemProperty = QQuickItemPrivate::get(that->contentItem())->data(); @@ -2230,7 +2230,7 @@ void QQuickWindow::cleanupSceneGraph() void QQuickWindow::setTransientParent_helper(QQuickWindow *window) { - qCDebug(lcTransient) << this << "is transient for" << window; + qCDebug(lcTransient) << "Setting" << window << "as transient parent of" << this; setTransientParent(window); disconnect(sender(), SIGNAL(windowChanged(QQuickWindow*)), this, SLOT(setTransientParent_helper(QQuickWindow*))); |