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/qquickanimatedimage_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/qquickanimatedimage_p.h')
| -rw-r--r-- | src/quick/items/qquickanimatedimage_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/qquickanimatedimage_p.h b/src/quick/items/qquickanimatedimage_p.h index 288a8379da..143fe8904d 100644 --- a/src/quick/items/qquickanimatedimage_p.h +++ b/src/quick/items/qquickanimatedimage_p.h @@ -51,9 +51,11 @@ // We mean it. // -#include "qquickimage_p.h" +#include <private/qtquickglobal_p.h> + +QT_REQUIRE_CONFIG(quick_animatedimage); -#ifndef QT_NO_MOVIE +#include "qquickimage_p.h" QT_BEGIN_NAMESPACE @@ -116,6 +118,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickAnimatedImage) -#endif // QT_NO_MOVIE - #endif // QQUICKANIMATEDIMAGE_P_H |