diff options
| author | J-P Nurmi <[email protected]> | 2015-04-10 14:20:39 +0200 |
|---|---|---|
| committer | Simon Hausmann <[email protected]> | 2015-04-17 14:08:35 +0000 |
| commit | 0ca50c64b087f4affafda18c6a3ba25d734d4888 (patch) | |
| tree | ba44570d85c16dcd9f2bae8f46926caab1502a5d | |
| parent | b8dbd08705fa698b516addbe5ce07159cce0409b (diff) | |
qquickitemviewtransition_p.h: eliminate a "_p_p.h" include
QtQuick.Controls2.StackView includes qquickitemviewtransition_p.h
to run push/pop transitions from C++. Make this header include less
and use forward declares to avoid including Q_AUTOTEST_EXPORT'd
classes, causing a linking error on Windows.
Change-Id: Ide82a66de62697d01609e5e03798b7a6a893c418
Reviewed-by: Friedemann Kleint <[email protected]>
Reviewed-by: Liang Qi <[email protected]>
Reviewed-by: Elvis Teixeira
| -rw-r--r-- | src/quick/items/qquickitemviewtransition.cpp | 1 | ||||
| -rw-r--r-- | src/quick/items/qquickitemviewtransition_p.h | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/quick/items/qquickitemviewtransition.cpp b/src/quick/items/qquickitemviewtransition.cpp index 7fa6cdc161..6fa299bf03 100644 --- a/src/quick/items/qquickitemviewtransition.cpp +++ b/src/quick/items/qquickitemviewtransition.cpp @@ -34,6 +34,7 @@ #include "qquickitemviewtransition_p.h" #include <QtQuick/qquickitem.h> #include <QtQuick/private/qquicktransition_p.h> +#include <QtQuick/private/qquicktransitionmanager_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick/items/qquickitemviewtransition_p.h b/src/quick/items/qquickitemviewtransition_p.h index 9be167f398..6f93697cc5 100644 --- a/src/quick/items/qquickitemviewtransition_p.h +++ b/src/quick/items/qquickitemviewtransition_p.h @@ -34,11 +34,15 @@ #ifndef QQUICKITEMVIEWTRANSITION_P_P_H #define QQUICKITEMVIEWTRANSITION_P_P_H -#include <private/qquicktransitionmanager_p_p.h> +#include <QtQuick/private/qtquickglobal_p.h> +#include <QtCore/qobject.h> +#include <QtCore/qpoint.h> +#include <QtQml/qqml.h> QT_BEGIN_NAMESPACE class QQuickItem; +class QQuickTransition; class QQuickItemViewTransitionableItem; class QQuickItemViewTransitionJob; |