diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-06-22 21:17:57 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-06-23 08:59:04 +0000 |
| commit | 83c31defc6a8dce29073f626aa2aaf7b26e4f029 (patch) | |
| tree | 7c792a3f3be1686a8a4ce8753c1c2dbe8dbdd4b1 /src/quicktemplates2/qquickapplicationwindow.cpp | |
| parent | 319f1d52a6953d613b42f325f8c530ddbcdd297a (diff) | |
Fix palette inheritance for popups
9b20157 fixed font inheritence for popups in 5.9. This commit applies
the same logic for palettes, and adds the same inheritance tests.
Change-Id: Ib286ddcb9fc7ac4fb681d440c76d728dd07cb983
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickapplicationwindow.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickapplicationwindow.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp index a6523553..6dda6f5d 100644 --- a/src/quicktemplates2/qquickapplicationwindow.cpp +++ b/src/quicktemplates2/qquickapplicationwindow.cpp @@ -290,11 +290,9 @@ void QQuickApplicationWindowPrivate::updatePalette(const QPalette &p) const bool changed = palette != p; palette = p; - QQuickItem *rootItem = q->QQuickWindow::contentItem(); - QQuickControlPrivate::updatePaletteRecur(rootItem, p); + QQuickControlPrivate::updatePaletteRecur(q->QQuickWindow::contentItem(), p); - // TODO: internal QQuickPopupManager that provides reliable access to all QQuickPopup instances - const QList<QQuickPopup *> popups = rootItem->findChildren<QQuickPopup *>(); + const QList<QQuickPopup *> popups = q->findChildren<QQuickPopup *>(); for (QQuickPopup *popup : popups) QQuickControlPrivate::get(static_cast<QQuickControl *>(popup->popupItem()))->inheritPalette(p); |