diff options
author | Liang Qi <liang.qi@qt.io> | 2016-10-18 08:33:26 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-10-18 08:33:26 +0200 |
commit | f04c2c40fd7ee91e5cbff2ca4df0fdc30dfbbcd5 (patch) | |
tree | 4e96d097987deb8d4d1a963e911dcbd1641a8502 /src/quick/items/qquickitemanimation_p_p.h | |
parent | 0da811cdfebdae1d96c99fe681e6a776e73d2f7f (diff) | |
parent | e76ed6a2655894bd671ee7397a15f2e57cfc8d33 (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/qml/jsruntime/qv4variantobject.cpp
src/qml/types/qquickworkerscript.cpp
src/quick/scenegraph/util/qsgdefaultpainternode_p.h
tools/qmljs/qmljs.cpp
Change-Id: I876242714ec8c046238d8fd673a5ace2455b2b59
Diffstat (limited to 'src/quick/items/qquickitemanimation_p_p.h')
-rw-r--r-- | src/quick/items/qquickitemanimation_p_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/quick/items/qquickitemanimation_p_p.h b/src/quick/items/qquickitemanimation_p_p.h index 99c973eb25..2d075dfab3 100644 --- a/src/quick/items/qquickitemanimation_p_p.h +++ b/src/quick/items/qquickitemanimation_p_p.h @@ -53,7 +53,9 @@ #include "qquickitemanimation_p.h" +#if QT_CONFIG(quick_path) #include <private/qquickpath_p.h> +#endif #include <private/qquickanimation_p_p.h> QT_BEGIN_NAMESPACE @@ -84,6 +86,8 @@ public: QList<QQuickItem*> targets; }; +#if QT_CONFIG(quick_path) + class QQuickPathAnimationUpdater : public QQuickBulkValueUpdater { public: @@ -153,6 +157,7 @@ public: QHash<QQuickItem*, QQuickPathAnimationAnimator* > activeAnimations; }; +#endif QT_END_NAMESPACE |