diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2017-12-18 17:37:47 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-01-15 14:57:34 +0000 |
commit | bef7f9f4137d1571b4a030a5c87281be6020411a (patch) | |
tree | 5acca9e746c1b3162b6bbe6cb9717be07eab0095 /src | |
parent | 6fe75203a399b8cd0848ca9bda9d9aa4fdf3edd5 (diff) |
Add a feature Qt Quick Repeater
Change-Id: I863e721c623f7916ea36a34edd2d6faece1d06a4
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/quick/configure.json | 9 | ||||
-rw-r--r-- | src/quick/items/items.pri | 12 | ||||
-rw-r--r-- | src/quick/items/qquickitemsmodule.cpp | 4 | ||||
-rw-r--r-- | src/quick/items/qquickrepeater_p.h | 4 | ||||
-rw-r--r-- | src/quick/items/qquickrepeater_p_p.h | 2 |
5 files changed, 28 insertions, 3 deletions
diff --git a/src/quick/configure.json b/src/quick/configure.json index 65ad5b810b..7004ea7f7b 100644 --- a/src/quick/configure.json +++ b/src/quick/configure.json @@ -139,6 +139,14 @@ "privateFeature" ] }, + "quick-repeater": { + "label": "Repeater item", + "purpose": "Provides the Repeater item.", + "section": "Qt Quick", + "output": [ + "privateFeature" + ] + }, "quick-shadereffect": { "label": "ShaderEffect item", "purpose": "Provides Shader effects.", @@ -171,6 +179,7 @@ "quick-path", "quick-pathview", "quick-positioners", + "quick-repeater", "quick-shadereffect", "quick-sprite" ] diff --git a/src/quick/items/items.pri b/src/quick/items/items.pri index 0f8061b5ef..1acb3b5265 100644 --- a/src/quick/items/items.pri +++ b/src/quick/items/items.pri @@ -41,8 +41,6 @@ HEADERS += \ $$PWD/qquickflickable_p.h \ $$PWD/qquickflickable_p_p.h \ $$PWD/qquickflickablebehavior_p.h \ - $$PWD/qquickrepeater_p.h \ - $$PWD/qquickrepeater_p_p.h \ $$PWD/qquickloader_p.h \ $$PWD/qquickloader_p_p.h \ $$PWD/qquicktranslate_p.h \ @@ -89,7 +87,6 @@ SOURCES += \ $$PWD/qquickmousearea.cpp \ $$PWD/qquickpincharea.cpp \ $$PWD/qquickflickable.cpp \ - $$PWD/qquickrepeater.cpp \ $$PWD/qquickloader.cpp \ $$PWD/qquicktranslate.cpp \ $$PWD/qquickclipnode.cpp \ @@ -168,6 +165,15 @@ qtConfig(quick-flipable) { $$PWD/qquickflipable.cpp } +qtConfig(quick-repeater) { + HEADERS += \ + $$PWD/qquickrepeater_p.h \ + $$PWD/qquickrepeater_p_p.h + + SOURCES += \ + $$PWD/qquickrepeater.cpp +} + qtConfig(quick-shadereffect) { HEADERS += \ $$PWD/qquickshadereffectsource_p.h \ diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp index 5261b194d1..a7600c97bc 100644 --- a/src/quick/items/qquickitemsmodule.cpp +++ b/src/quick/items/qquickitemsmodule.cpp @@ -74,7 +74,9 @@ #if QT_CONFIG(quick_positioners) #include "qquickpositioners_p.h" #endif +#if QT_CONFIG(quick_repeater) #include "qquickrepeater_p.h" +#endif #include "qquickloader_p.h" #if QT_CONFIG(quick_animatedimage) #include "qquickanimatedimage_p.h" @@ -207,7 +209,9 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor) qmlRegisterType<QQuickPathView>(uri,major,minor,"PathView"); #endif qmlRegisterType<QQuickRectangle>(uri,major,minor,"Rectangle"); +#if QT_CONFIG(quick_repeater) qmlRegisterType<QQuickRepeater>(uri,major,minor,"Repeater"); +#endif qmlRegisterType<QQuickTranslate>(uri,major,minor,"Translate"); qmlRegisterType<QQuickRotation>(uri,major,minor,"Rotation"); qmlRegisterType<QQuickScale>(uri,major,minor,"Scale"); diff --git a/src/quick/items/qquickrepeater_p.h b/src/quick/items/qquickrepeater_p.h index b630999547..39e29937f9 100644 --- a/src/quick/items/qquickrepeater_p.h +++ b/src/quick/items/qquickrepeater_p.h @@ -53,6 +53,10 @@ #include "qquickitem.h" +#include <private/qtquickglobal_p.h> + +QT_REQUIRE_CONFIG(quick_repeater); + QT_BEGIN_NAMESPACE class QQmlChangeSet; diff --git a/src/quick/items/qquickrepeater_p_p.h b/src/quick/items/qquickrepeater_p_p.h index 64380688c9..942f428904 100644 --- a/src/quick/items/qquickrepeater_p_p.h +++ b/src/quick/items/qquickrepeater_p_p.h @@ -56,6 +56,8 @@ #include <QtCore/qpointer.h> +QT_REQUIRE_CONFIG(quick_repeater); + QT_BEGIN_NAMESPACE class QQmlContext; |