Make Flipable configurable

Change-Id: Iaf060c6abefb8bfff9b9f3727bd477ae3c96b7a4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

4 files changed, 24 insertions, 2 deletions

diff --git a/src/quick/configure.json b/src/quick/configure.json
index 8a0c6e3562..798e8c2f14 100644
--- a/src/quick/configure.json
+++ b/src/quick/configure.json
@@ -9,6 +9,7 @@
         "options": {
             "d3d12": "boolean",
             "quick-canvas": "boolean",
+            "quick-flipable": "boolean",
             "quick-path": "boolean",
             "quick-pathview": "boolean"
         }
@@ -38,6 +39,13 @@
                 "privateFeature"
             ]
         },
+        "quick-flipable": {
+            "label": "Flipable item",
+            "purpose": "Provides the Qt Quick Flipable Item",
+            "output": [
+                "privateFeature"
+            ]
+        },
         "quick-path": {
             "label": "Path support",
             "purpose": "Provides Path elements in Qt Quick",
@@ -61,6 +69,7 @@
             "entries": [
                 "d3d12",
                 "quick-canvas",
+                "quick-flipable",
                 "quick-path",
                 "quick-pathview"
             ]
diff --git a/src/quick/items/items.pri b/src/quick/items/items.pri
index 703acaa9e8..fe3bed3b3a 100644
--- a/src/quick/items/items.pri
+++ b/src/quick/items/items.pri
@@ -51,7 +51,6 @@ HEADERS += \
     $$PWD/qquickloader_p_p.h \
     $$PWD/qquickanimatedimage_p.h \
     $$PWD/qquickanimatedimage_p_p.h \
-    $$PWD/qquickflipable_p.h \
     $$PWD/qquicktranslate_p.h \
     $$PWD/qquickclipnode_p.h \
     $$PWD/qquickview.h \
@@ -115,7 +114,6 @@ SOURCES += \
     $$PWD/qquickpositioners.cpp \
     $$PWD/qquickloader.cpp \
     $$PWD/qquickanimatedimage.cpp \
-    $$PWD/qquickflipable.cpp \
     $$PWD/qquicktranslate.cpp \
     $$PWD/qquickclipnode.cpp \
     $$PWD/qquickview.cpp \
@@ -151,6 +149,13 @@ qtConfig(quick-pathview) {
         $$PWD/qquickpathview.cpp
 }
 
+qtConfig(quick-flipable) {
+    HEADERS += \
+        $$PWD/qquickflipable_p.h
+    SOURCES += \
+        $$PWD/qquickflipable.cpp
+}
+
 # Items that depend on OpenGL Renderer
 qtConfig(opengl(es1|es2)?) {
     SOURCES += \
diff --git a/src/quick/items/qquickflipable_p.h b/src/quick/items/qquickflipable_p.h
index 189d94775a..17a74d1f7a 100644
--- a/src/quick/items/qquickflipable_p.h
+++ b/src/quick/items/qquickflipable_p.h
@@ -51,6 +51,10 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_flipable);
+
 #include "qquickitem.h"
 
 #include <QtGui/qtransform.h>
diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp
index dffefa5869..ec21de1915 100644
--- a/src/quick/items/qquickitemsmodule.cpp
+++ b/src/quick/items/qquickitemsmodule.cpp
@@ -69,7 +69,9 @@
 #include "qquickrepeater_p.h"
 #include "qquickloader_p.h"
 #include "qquickanimatedimage_p.h"
+#if QT_CONFIG(quick_flipable)
 #include "qquickflipable_p.h"
+#endif
 #include "qquicktranslate_p.h"
 #include "qquickstateoperations_p.h"
 #include "qquickitemanimation_p.h"
@@ -148,7 +150,9 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
     qmlRegisterType<QQuickBorderImage>(uri,major,minor,"BorderImage");
     qmlRegisterType<QQuickColumn>(uri,major,minor,"Column");
     qmlRegisterType<QQuickFlickable>(uri,major,minor,"Flickable");
+#if QT_CONFIG(quick_flipable)
     qmlRegisterType<QQuickFlipable>(uri,major,minor,"Flipable");
+#endif
     qmlRegisterType<QQuickFlow>(uri,major,minor,"Flow");
 //    qmlRegisterType<QQuickFocusPanel>(uri,major,minor,"FocusPanel");
     qmlRegisterType<QQuickFocusScope>(uri,major,minor,"FocusScope");