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_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_p.h')
| -rw-r--r-- | src/quick/items/qquickanimatedimage_p_p.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/quick/items/qquickanimatedimage_p_p.h b/src/quick/items/qquickanimatedimage_p_p.h index ed735d1c9c..9eff6a44e3 100644 --- a/src/quick/items/qquickanimatedimage_p_p.h +++ b/src/quick/items/qquickanimatedimage_p_p.h @@ -51,14 +51,16 @@ // We mean it. // -#include "qquickimage_p_p.h" +#include <QtQuick/qtquickglobal.h> + +QT_REQUIRE_CONFIG(quick_animatedimage); -#ifndef QT_NO_MOVIE +#include "qquickimage_p_p.h" QT_BEGIN_NAMESPACE class QMovie; -#ifndef QT_NO_NETWORK +#if QT_CONFIG(qml_network) class QNetworkReply; #endif @@ -69,7 +71,7 @@ class QQuickAnimatedImagePrivate : public QQuickImagePrivate public: QQuickAnimatedImagePrivate() : playing(true), paused(false), preset_currentframe(0), _movie(0), oldPlaying(false) -#ifndef QT_NO_NETWORK +#if QT_CONFIG(qml_network) , reply(0), redirectCount(0) #endif , currentSourceSize(0, 0) @@ -83,7 +85,7 @@ public: int preset_currentframe; QMovie *_movie; bool oldPlaying; -#ifndef QT_NO_NETWORK +#if QT_CONFIG(qml_network) QNetworkReply *reply; int redirectCount; #endif @@ -93,6 +95,4 @@ public: QT_END_NAMESPACE -#endif // QT_NO_MOVIE - #endif // QQUICKANIMATEDIMAGE_P_P_H |