From eae92384b0f59a7c27edd422e5b3f26c2d8b323c Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@qt.io>
Date: Tue, 24 Jan 2017 17:38:11 +0100
Subject: Compile with -no-feature-itemviews

Change-Id: I23506f06df35f124f5eb9fcc8426c63b407a0872
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/widgets/configure.json                  |  2 +-
 src/widgets/itemviews/itemviews.pri         | 11 ++++++++---
 src/widgets/widgets/qabstractscrollarea.cpp |  3 ++-
 3 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/widgets/configure.json b/src/widgets/configure.json
index 8acbffef6a..92a57534e6 100644
--- a/src/widgets/configure.json
+++ b/src/widgets/configure.json
@@ -504,7 +504,7 @@
             "label": "QCompleter",
             "purpose": "Provides completions based on an item model.",
             "section": "Utilities",
-            "condition": "features.proxymodel",
+            "condition": "features.proxymodel && features.itemviews",
             "output": [ "publicFeature", "feature" ]
         },
         "fscompleter": {
diff --git a/src/widgets/itemviews/itemviews.pri b/src/widgets/itemviews/itemviews.pri
index 245962d35f..d78bc4b40e 100644
--- a/src/widgets/itemviews/itemviews.pri
+++ b/src/widgets/itemviews/itemviews.pri
@@ -1,5 +1,6 @@
 # Qt gui library, itemviews
 
+qtConfig(itemviews) {
 HEADERS += \
 	itemviews/qabstractitemview.h \
     itemviews/qabstractitemview_p.h \
@@ -27,8 +28,6 @@ HEADERS += \
 	itemviews/qitemeditorfactory_p.h \
 	itemviews/qtreewidgetitemiterator.h \
     itemviews/qdatawidgetmapper.h \
-    itemviews/qfileiconprovider.h \
-    itemviews/qfileiconprovider_p.h \
     itemviews/qcolumnviewgrip_p.h \
     itemviews/qcolumnview.h  \
     itemviews/qcolumnview_p.h \
@@ -50,8 +49,14 @@ SOURCES += \
 	itemviews/qitemeditorfactory.cpp \
 	itemviews/qtreewidgetitemiterator.cpp \
     itemviews/qdatawidgetmapper.cpp \
-    itemviews/qfileiconprovider.cpp \
     itemviews/qcolumnview.cpp \
     itemviews/qcolumnviewgrip.cpp \
     itemviews/qstyleditemdelegate.cpp
+}
+
+HEADERS += \
+    itemviews/qfileiconprovider.h \
+    itemviews/qfileiconprovider_p.h \
 
+SOURCES +=  \
+        itemviews/qfileiconprovider.cpp
diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp
index 5b31e4467f..35b9851cad 100644
--- a/src/widgets/widgets/qabstractscrollarea.cpp
+++ b/src/widgets/widgets/qabstractscrollarea.cpp
@@ -473,6 +473,7 @@ void QAbstractScrollAreaPrivate::layoutChildren()
     // move the scrollbars away from top/left headers
     int vHeaderRight = 0;
     int hHeaderBottom = 0;
+#if QT_CONFIG(itemviews)
     if ((vscrollOverlap > 0 && needv) || (hscrollOverlap > 0 && needh)) {
         const QList<QHeaderView *> headers = q->findChildren<QHeaderView*>();
         if (headers.count() <= 2) {
@@ -485,7 +486,7 @@ void QAbstractScrollAreaPrivate::layoutChildren()
              }
          }
     }
-
+#endif // QT_CONFIG(itemviews)
     if (needh) {
         QRect horizontalScrollBarRect(QPoint(controlsRect.left() + vHeaderRight, cornerPoint.y()), QPoint(cornerPoint.x() - 1, controlsRect.bottom()));
 #if 0 // Used to be included in Qt4 for Q_WS_MAC
-- 
cgit v1.2.3