diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-10-26 09:46:11 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-10-26 09:20:03 +0000 |
commit | 03a8c88225f5e578c51cb7d45d30ef07e636debd (patch) | |
tree | dbd5e59f789cfdb7cc9ffcebd728ad5769a7a8b3 /src/quicktemplates2/qquickpopup_p_p.h | |
parent | b2c608e8559552b34547f8fa90bb7f1d4b1dcaa5 (diff) |
QQuickPopup: move the implementation of reposition() to the positioner
In the future, the exact type of positioner might vary depending on
whether the popup is an item or a window.
Change-Id: Id17d1976c7bca72cecb3e9567355264526527286
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickpopup_p_p.h')
-rw-r--r-- | src/quicktemplates2/qquickpopup_p_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickpopup_p_p.h b/src/quicktemplates2/qquickpopup_p_p.h index a44f193b..56baaa36 100644 --- a/src/quicktemplates2/qquickpopup_p_p.h +++ b/src/quicktemplates2/qquickpopup_p_p.h @@ -50,7 +50,6 @@ #include "qquickpopup_p.h" #include "qquickcontrol_p.h" -#include "qquickpopuppositioner_p_p.h" #include <QtCore/private/qobject_p.h> #include <QtQuick/qquickitem.h> @@ -64,6 +63,7 @@ class QQuickTransitionManager; class QQuickPopup; class QQuickPopupItem; class QQuickPopupPrivate; +class QQuickPopupPositioner; class QQuickPopupTransitionManager : public QQuickTransitionManager { @@ -155,7 +155,7 @@ public: QQuickTransition *enter; QQuickTransition *exit; QQuickPopupItem *popupItem; - QQuickPopupPositioner positioner; + QQuickPopupPositioner *positioner; QList<QQuickStateAction> enterActions; QList<QQuickStateAction> exitActions; QQuickPopupTransitionManager transitionManager; |