diff options
| -rw-r--r-- | src/quick/configure.json | 10 | ||||
| -rw-r--r-- | src/quick/items/items.pri | 11 | ||||
| -rw-r--r-- | src/quick/items/qquickanimatedimage.cpp | 4 | ||||
| -rw-r--r-- | src/quick/items/qquickanimatedimage_p.h | 8 | ||||
| -rw-r--r-- | src/quick/items/qquickanimatedimage_p_p.h | 8 | ||||
| -rw-r--r-- | src/quick/items/qquickitemsmodule.cpp | 4 |
6 files changed, 29 insertions, 16 deletions
diff --git a/src/quick/configure.json b/src/quick/configure.json index 5602cf46a4..066ee88b3a 100644 --- a/src/quick/configure.json +++ b/src/quick/configure.json @@ -8,6 +8,7 @@ "commandline": { "options": { "d3d12": "boolean", + "quick-animatedimage": "boolean", "quick-canvas": "boolean", "quick-flipable": "boolean", "quick-listview": "boolean", @@ -33,6 +34,14 @@ "privateFeature" ] }, + "quick-animatedimage": { + "label": "AnimatedImage item", + "purpose": "Provides the Qt Quick AnimatedImage Item", + "condition": "features.movie", + "output": [ + "privateFeature" + ] + }, "quick-canvas": { "label": "Canvas item", "purpose": "Provides the Qt Quick Canvas Item", @@ -76,6 +85,7 @@ "section": "Qt Quick", "entries": [ "d3d12", + "quick-animatedimage", "quick-canvas", "quick-flipable", "quick-listview", diff --git a/src/quick/items/items.pri b/src/quick/items/items.pri index 5f13f65d6f..d537e4e091 100644 --- a/src/quick/items/items.pri +++ b/src/quick/items/items.pri @@ -48,8 +48,6 @@ HEADERS += \ $$PWD/qquickpositioners_p_p.h \ $$PWD/qquickloader_p.h \ $$PWD/qquickloader_p_p.h \ - $$PWD/qquickanimatedimage_p.h \ - $$PWD/qquickanimatedimage_p_p.h \ $$PWD/qquicktranslate_p.h \ $$PWD/qquickclipnode_p.h \ $$PWD/qquickview.h \ @@ -111,7 +109,6 @@ SOURCES += \ $$PWD/qquickgridview.cpp \ $$PWD/qquickpositioners.cpp \ $$PWD/qquickloader.cpp \ - $$PWD/qquickanimatedimage.cpp \ $$PWD/qquicktranslate.cpp \ $$PWD/qquickclipnode.cpp \ $$PWD/qquickview.cpp \ @@ -139,6 +136,14 @@ SOURCES += \ $$PWD/qquickspritesequence.cpp \ $$PWD/qquickanimatedsprite.cpp +qtConfig(quick-animatedimage) { + HEADERS += \ + $$PWD/qquickanimatedimage_p.h \ + $$PWD/qquickanimatedimage_p_p.h + SOURCES += \ + $$PWD/qquickanimatedimage.cpp +} + qtConfig(quick-listview) { HEADERS += \ $$PWD/qquicklistview_p.h diff --git a/src/quick/items/qquickanimatedimage.cpp b/src/quick/items/qquickanimatedimage.cpp index 85251330cb..81c649dbd5 100644 --- a/src/quick/items/qquickanimatedimage.cpp +++ b/src/quick/items/qquickanimatedimage.cpp @@ -40,8 +40,6 @@ #include "qquickanimatedimage_p.h" #include "qquickanimatedimage_p_p.h" -#ifndef QT_NO_MOVIE - #include <QtGui/qguiapplication.h> #include <QtQml/qqmlinfo.h> #include <QtQml/qqmlfile.h> @@ -493,5 +491,3 @@ void QQuickAnimatedImage::componentComplete() } QT_END_NAMESPACE - -#endif // QT_NO_MOVIE 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 diff --git a/src/quick/items/qquickanimatedimage_p_p.h b/src/quick/items/qquickanimatedimage_p_p.h index 6d0600b331..9eff6a44e3 100644 --- a/src/quick/items/qquickanimatedimage_p_p.h +++ b/src/quick/items/qquickanimatedimage_p_p.h @@ -51,9 +51,11 @@ // 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 @@ -93,6 +95,4 @@ public: QT_END_NAMESPACE -#endif // QT_NO_MOVIE - #endif // QQUICKANIMATEDIMAGE_P_P_H diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp index 7237476313..157ca3b030 100644 --- a/src/quick/items/qquickitemsmodule.cpp +++ b/src/quick/items/qquickitemsmodule.cpp @@ -70,7 +70,9 @@ #include "qquickpositioners_p.h" #include "qquickrepeater_p.h" #include "qquickloader_p.h" +#if QT_CONFIG(quick_animatedimage) #include "qquickanimatedimage_p.h" +#endif #if QT_CONFIG(quick_flipable) #include "qquickflipable_p.h" #endif @@ -144,7 +146,7 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor) QQmlPrivate::RegisterAutoParent autoparent = { 0, &qquickitem_autoParent }; QQmlPrivate::qmlregister(QQmlPrivate::AutoParentRegistration, &autoparent); -#ifdef QT_NO_MOVIE +#if !QT_CONFIG(quick_animatedimage) qmlRegisterTypeNotAvailable(uri,major,minor,"AnimatedImage", QCoreApplication::translate("QQuickAnimatedImage","Qt was built without support for QMovie")); #else qmlRegisterType<QQuickAnimatedImage>(uri,major,minor,"AnimatedImage"); |