diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2021-06-25 11:40:05 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2021-08-10 08:34:37 +0200 |
| commit | b69d071c10dfa4c5d7b62692b8a9d7bb659a4ab5 (patch) | |
| tree | 5cde00f41ed8fbe26c138332886372a7d366f5b8 /src/quicktemplates2/qquickpopup_p_p.h | |
| parent | ebad2bf18d10f96096d11fa1e2c1851270d2071d (diff) | |
Revert "Allow creation of custom QQuickPopupItem-derived types"
This reverts commit 6b8a9673111bbf888990ce5904e176057ad4a71b.
The follow-up commit a063cd0be5e8f108a0084831856f4af8c0e9159c
causes QTBUG-94764, so we don't need this enabling change for now.
Task-number: QTBUG-83630
Task-number: QTBUG-94764
Pick-to: 5.15 6.1 6.2
Change-Id: I1aec8571dcdcc2103d0e56c3d0bbfc4a4872d8db
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickpopup_p_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickpopup_p_p.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/quicktemplates2/qquickpopup_p_p.h b/src/quicktemplates2/qquickpopup_p_p.h index 0a00c2aad0..a598399635 100644 --- a/src/quicktemplates2/qquickpopup_p_p.h +++ b/src/quicktemplates2/qquickpopup_p_p.h @@ -101,9 +101,7 @@ public: QQmlListProperty<QObject> contentData(); QQmlListProperty<QQuickItem> contentChildren(); - virtual void init(); - void createPopupItem(); - void connectToPopupItem(); + void init(); void closeOrReject(); bool tryClose(const QPointF &pos, QQuickPopup::ClosePolicy flags); |