3 files changed, 13 insertions, 8 deletions
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/itemviews/qcolumnview.cpp b/src/widgets/itemviews/qcolumnview.cpp
index 6c7c914bc0..ea9bbb0fb9 100644
--- a/src/widgets/itemviews/qcolumnview.cpp
+++ b/src/widgets/itemviews/qcolumnview.cpp
@@ -38,10 +38,10 @@
 ****************************************************************************/
 
 #include <qglobal.h>
+#include "qcolumnview.h"
 
-#ifndef QT_NO_COLUMNVIEW
+#if QT_CONFIG(columnview)
 
-#include "qcolumnview.h"
 #include "qcolumnview_p.h"
 #include "qcolumnviewgrip_p.h"
 
@@ -1170,4 +1170,4 @@ QT_END_NAMESPACE
 
 #include "moc_qcolumnview.cpp"
 
-#endif // QT_NO_COLUMNVIEW
+#endif // QT_CONFIG(columnview)
diff --git a/src/widgets/itemviews/qtreewidgetitemiterator_p.h b/src/widgets/itemviews/qtreewidgetitemiterator_p.h
index 4b6c7b0a57..e68f6103d3 100644
--- a/src/widgets/itemviews/qtreewidgetitemiterator_p.h
+++ b/src/widgets/itemviews/qtreewidgetitemiterator_p.h
@@ -53,8 +53,8 @@
 
 #include <QtCore/qstack.h>
 
-#ifndef QT_NO_TREEWIDGET
 #include "qtreewidgetitemiterator.h"
+#if QT_CONFIG(treewidget)
 
 QT_BEGIN_NAMESPACE
 
@@ -103,6 +103,6 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_TREEWIDGET
+#endif // QT_CONFIG(treewidget)
 
 #endif //QTREEWIDGETITEMITERATOR_P_H