diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-05-19 07:05:18 +0300 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-05-19 07:05:18 +0300 |
commit | a970e15d7281d2d13485a486c6debadf46ed7950 (patch) | |
tree | 449e0526a803758301861c8a8ce9f4ed96385981 /src/quicktemplates2/qquickpopup.cpp | |
parent | 69c1a1e86b9774fbee6958021055c899151e1955 (diff) | |
parent | f3377bd4d790fb07bdcac06ac9f803856fee07d9 (diff) |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into tqtc/lts-5.15-opensourcev5.15.5-lts-lgpl
Change-Id: Iec31024aafdb1785574ba6450ca754f4660c05ee
Diffstat (limited to 'src/quicktemplates2/qquickpopup.cpp')
-rw-r--r-- | src/quicktemplates2/qquickpopup.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index bdc6dff2..8a03198e 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -275,9 +275,21 @@ QQuickPopupPrivate::QQuickPopupPrivate() void QQuickPopupPrivate::init() { Q_Q(QQuickPopup); - popupItem = new QQuickPopupItem(q); + createPopupItem(); popupItem->setVisible(false); q->setParentItem(qobject_cast<QQuickItem *>(parent)); + connectToPopupItem(); +} + +void QQuickPopupPrivate::createPopupItem() +{ + Q_Q(QQuickPopup); + popupItem = new QQuickPopupItem(q); +} + +void QQuickPopupPrivate::connectToPopupItem() +{ + Q_Q(QQuickPopup); QObject::connect(popupItem, &QQuickControl::paddingChanged, q, &QQuickPopup::paddingChanged); QObject::connect(popupItem, &QQuickControl::backgroundChanged, q, &QQuickPopup::backgroundChanged); QObject::connect(popupItem, &QQuickControl::contentItemChanged, q, &QQuickPopup::contentItemChanged); @@ -842,8 +854,7 @@ QQuickPopup::QQuickPopup(QObject *parent) QQuickPopup::QQuickPopup(QQuickPopupPrivate &dd, QObject *parent) : QObject(dd, parent) { - Q_D(QQuickPopup); - d->init(); + dd.init(); } QQuickPopup::~QQuickPopup() |