From a266bc967bb2d9069f4b882b208eed74bcd83dd1 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Tue, 16 Aug 2016 16:06:16 +0200
Subject: Make ListView item configurable

Change-Id: Iaecae9a9e1bf5e073f94e76531e65d381e7fa01f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/quick/configure.json              |  9 +++++++++
 src/quick/items/items.pri             |  9 +++++++--
 src/quick/items/qquickitemsmodule.cpp | 12 +++++++++++-
 src/quick/items/qquicklistview_p.h    |  4 ++++
 4 files changed, 31 insertions(+), 3 deletions(-)

(limited to 'src/quick')

diff --git a/src/quick/configure.json b/src/quick/configure.json
index 798e8c2f14..5602cf46a4 100644
--- a/src/quick/configure.json
+++ b/src/quick/configure.json
@@ -10,6 +10,7 @@
             "d3d12": "boolean",
             "quick-canvas": "boolean",
             "quick-flipable": "boolean",
+            "quick-listview": "boolean",
             "quick-path": "boolean",
             "quick-pathview": "boolean"
         }
@@ -46,6 +47,13 @@
                 "privateFeature"
             ]
         },
+        "quick-listview": {
+            "label": "ListView item",
+            "purpose": "Provides the Qt Quick ListView item",
+            "output": [
+                "privateFeature"
+            ]
+        },
         "quick-path": {
             "label": "Path support",
             "purpose": "Provides Path elements in Qt Quick",
@@ -70,6 +78,7 @@
                 "d3d12",
                 "quick-canvas",
                 "quick-flipable",
+                "quick-listview",
                 "quick-path",
                 "quick-pathview"
             ]
diff --git a/src/quick/items/items.pri b/src/quick/items/items.pri
index fe3bed3b3a..5f13f65d6f 100644
--- a/src/quick/items/items.pri
+++ b/src/quick/items/items.pri
@@ -41,7 +41,6 @@ HEADERS += \
     $$PWD/qquickflickable_p.h \
     $$PWD/qquickflickable_p_p.h \
     $$PWD/qquickflickablebehavior_p.h \
-    $$PWD/qquicklistview_p.h \
     $$PWD/qquickrepeater_p.h \
     $$PWD/qquickrepeater_p_p.h \
     $$PWD/qquickgridview_p.h \
@@ -108,7 +107,6 @@ SOURCES += \
     $$PWD/qquickmousearea.cpp \
     $$PWD/qquickpincharea.cpp \
     $$PWD/qquickflickable.cpp \
-    $$PWD/qquicklistview.cpp \
     $$PWD/qquickrepeater.cpp \
     $$PWD/qquickgridview.cpp \
     $$PWD/qquickpositioners.cpp \
@@ -141,6 +139,13 @@ SOURCES += \
     $$PWD/qquickspritesequence.cpp \
     $$PWD/qquickanimatedsprite.cpp
 
+qtConfig(quick-listview) {
+    HEADERS += \
+        $$PWD/qquicklistview_p.h
+    SOURCES += \
+        $$PWD/qquicklistview.cpp
+}
+
 qtConfig(quick-pathview) {
     HEADERS += \
         $$PWD/qquickpathview_p.h \
diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp
index ec21de1915..7237476313 100644
--- a/src/quick/items/qquickitemsmodule.cpp
+++ b/src/quick/items/qquickitemsmodule.cpp
@@ -55,7 +55,9 @@
 #include "qquickpincharea_p.h"
 #include "qquickflickable_p.h"
 #include "qquickflickable_p_p.h"
+#if QT_CONFIG(quick_listview)
 #include "qquicklistview_p.h"
+#endif
 #include "qquickgridview_p.h"
 #if QT_CONFIG(quick_pathview)
 #include "qquickpathview_p.h"
@@ -162,7 +164,10 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
     qmlRegisterType<QQuickGridView>(uri,major,minor,"GridView");
     qmlRegisterType<QQuickImage>(uri,major,minor,"Image");
     qmlRegisterType<QQuickItem>(uri,major,minor,"Item");
+#if QT_CONFIG(quick_listview)
     qmlRegisterType<QQuickListView>(uri,major,minor,"ListView");
+    qmlRegisterType<QQuickViewSection>(uri,major,minor,"ViewSection");
+#endif
     qmlRegisterType<QQuickLoader>(uri,major,minor,"Loader");
     qmlRegisterType<QQuickMouseArea>(uri,major,minor,"MouseArea");
 #if QT_CONFIG(quick_path)
@@ -194,7 +199,6 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
     qmlRegisterType<QQuickTextInput>(uri,major,minor,"TextInput");
     qmlRegisterType<QQuickTextInput,2>(uri,2,2,"TextInput");
     qmlRegisterType<QQuickTextInput,3>(uri,2,4,"TextInput");
-    qmlRegisterType<QQuickViewSection>(uri,major,minor,"ViewSection");
     qmlRegisterType<QQuickItemGrabResult>();
     qmlRegisterType<QQuickItemLayer>();
     qmlRegisterType<QQuickAnchors>();
@@ -269,7 +273,9 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
     qmlRegisterType<QQuickGrid, 1>(uri, 2, 1, "Grid");
     qmlRegisterUncreatableType<QQuickItemView, 1>(uri, 2, 1, "ItemView", QQuickItemView::tr("ItemView is an abstract base class"));
     qmlRegisterUncreatableType<QQuickItemView, 2>(uri, 2, 3, "ItemView", QQuickItemView::tr("ItemView is an abstract base class"));
+#if QT_CONFIG(quick_listview)
     qmlRegisterType<QQuickListView, 1>(uri, 2, 1, "ListView");
+#endif
     qmlRegisterType<QQuickGridView, 1>(uri, 2, 1, "GridView");
     qmlRegisterType<QQuickTextEdit, 1>(uri, 2, 1, "TextEdit");
 
@@ -281,7 +287,9 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
     qmlRegisterType<QQuickImage, 1>(uri, 2, 3,"Image");
 
     qmlRegisterType<QQuickItem, 2>(uri, 2, 4, "Item");
+#if QT_CONFIG(quick_listview)
     qmlRegisterType<QQuickListView, 2>(uri, 2, 4, "ListView");
+#endif
     qmlRegisterType<QQuickMouseArea, 1>(uri, 2, 4, "MouseArea");
     qmlRegisterType<QQuickShaderEffect, 1>(uri, 2, 4, "ShaderEffect");
 
@@ -305,7 +313,9 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
                                                            QQuickEnterKeyAttached::tr("EnterKey is only available via attached properties"));
     qmlRegisterType<QQuickShaderEffectSource, 1>(uri, 2, 6, "ShaderEffectSource");
 
+#if QT_CONFIG(quick_listview)
     qmlRegisterType<QQuickListView, 7>(uri, 2, 7, "ListView");
+#endif
     qmlRegisterType<QQuickGridView, 7>(uri, 2, 7, "GridView");
     qmlRegisterType<QQuickTextInput, 7>(uri, 2, 7, "TextInput");
     qmlRegisterType<QQuickTextEdit, 7>(uri, 2, 7, "TextEdit");
diff --git a/src/quick/items/qquicklistview_p.h b/src/quick/items/qquicklistview_p.h
index 5a5e8a55fe..8d0ad7f618 100644
--- a/src/quick/items/qquicklistview_p.h
+++ b/src/quick/items/qquicklistview_p.h
@@ -51,6 +51,10 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_listview);
+
 #include "qquickitemview_p.h"
 
 #include <private/qtquickglobal_p.h>
-- 
cgit v1.2.3