Merge remote-tracking branch 'origin/5.9' into dev

Conflicts:
	src/corelib/io/qprocess_unix.cpp
	src/corelib/io/qprocess_win.cpp
	src/plugins/platforms/android/qandroidplatformintegration.h
	src/plugins/platforms/windows/qwindowscontext.cpp
	src/plugins/platforms/windows/windows.pri
	src/tools/uic/cpp/cppwriteinitialization.cpp
	src/widgets/doc/src/widgets-and-layouts/gallery.qdoc

Change-Id: I8d0834c77f350ea7540140c2c7f372814afc2d0f

5 files changed, 17 insertions, 22 deletions

diff --git a/src/widgets/itemviews/itemviews.pri b/src/widgets/itemviews/itemviews.pri
index d78bc4b40e..ed0e3fe072 100644
--- a/src/widgets/itemviews/itemviews.pri
+++ b/src/widgets/itemviews/itemviews.pri
@@ -28,9 +28,6 @@ HEADERS += \
 	itemviews/qitemeditorfactory_p.h \
 	itemviews/qtreewidgetitemiterator.h \
     itemviews/qdatawidgetmapper.h \
-    itemviews/qcolumnviewgrip_p.h \
-    itemviews/qcolumnview.h  \
-    itemviews/qcolumnview_p.h \
     itemviews/qstyleditemdelegate.h
 
 SOURCES += \
@@ -49,11 +46,20 @@ SOURCES += \
 	itemviews/qitemeditorfactory.cpp \
 	itemviews/qtreewidgetitemiterator.cpp \
     itemviews/qdatawidgetmapper.cpp \
-    itemviews/qcolumnview.cpp \
-    itemviews/qcolumnviewgrip.cpp \
     itemviews/qstyleditemdelegate.cpp
 }
 
+qtConfig(columnview) {
+    HEADERS += \
+        itemviews/qcolumnviewgrip_p.h \
+        itemviews/qcolumnview.h  \
+        itemviews/qcolumnview_p.h
+
+    SOURCES += \
+        itemviews/qcolumnview.cpp \
+        itemviews/qcolumnviewgrip.cpp
+}
+
 HEADERS += \
     itemviews/qfileiconprovider.h \
     itemviews/qfileiconprovider_p.h \
diff --git a/src/widgets/itemviews/qcolumnview.h b/src/widgets/itemviews/qcolumnview.h
index 7d5e2f5cd1..42eac7426a 100644
--- a/src/widgets/itemviews/qcolumnview.h
+++ b/src/widgets/itemviews/qcolumnview.h
@@ -43,10 +43,9 @@
 #include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qabstractitemview.h>
 
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(columnview);
 
-#ifndef QT_NO_COLUMNVIEW
+QT_BEGIN_NAMESPACE
 
 class QColumnViewPrivate;
 
@@ -109,8 +108,6 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_clicked(const QModelIndex &))
 };
 
-#endif // QT_NO_COLUMNVIEW
-
 QT_END_NAMESPACE
 
 #endif // QCOLUMNVIEW_H
diff --git a/src/widgets/itemviews/qcolumnview_p.h b/src/widgets/itemviews/qcolumnview_p.h
index 7eff0f66cd..fa276075fe 100644
--- a/src/widgets/itemviews/qcolumnview_p.h
+++ b/src/widgets/itemviews/qcolumnview_p.h
@@ -54,8 +54,6 @@
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "qcolumnview.h"
 
-#ifndef QT_NO_QCOLUMNVIEW
-
 #include <private/qabstractitemview_p.h>
 
 #include <QtCore/qabstractitemmodel.h>
@@ -67,6 +65,8 @@
 #include <qevent.h>
 #include <qscrollbar.h>
 
+QT_REQUIRE_CONFIG(columnview);
+
 QT_BEGIN_NAMESPACE
 
 class QColumnViewPreviewColumn : public QAbstractItemView {
@@ -190,9 +190,7 @@ public:
                const QStyleOptionViewItem &option,
                const QModelIndex &index) const Q_DECL_OVERRIDE;
 };
-#endif // QT_NO_QCOLUMNVIEW
-
 
 QT_END_NAMESPACE
-#endif //QCOLUMNVIEW_P_H
 
+#endif //QCOLUMNVIEW_P_H
diff --git a/src/widgets/itemviews/qcolumnviewgrip.cpp b/src/widgets/itemviews/qcolumnviewgrip.cpp
index f7d6e6d2b0..4a4237805f 100644
--- a/src/widgets/itemviews/qcolumnviewgrip.cpp
+++ b/src/widgets/itemviews/qcolumnviewgrip.cpp
@@ -37,8 +37,6 @@
 **
 ****************************************************************************/
 
-#ifndef QT_NO_QCOLUMNVIEW
-
 #include "qcolumnviewgrip_p.h"
 #include <qstyleoption.h>
 #include <qpainter.h>
@@ -190,5 +188,3 @@ originalXLocation(-1)
 QT_END_NAMESPACE
 
 #include "moc_qcolumnviewgrip_p.cpp"
-
-#endif // QT_NO_QCOLUMNVIEW
diff --git a/src/widgets/itemviews/qcolumnviewgrip_p.h b/src/widgets/itemviews/qcolumnviewgrip_p.h
index 3447f9f824..16c0aefada 100644
--- a/src/widgets/itemviews/qcolumnviewgrip_p.h
+++ b/src/widgets/itemviews/qcolumnviewgrip_p.h
@@ -54,7 +54,7 @@
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <private/qwidget_p.h>
 
-#ifndef QT_NO_QCOLUMNVIEW
+QT_REQUIRE_CONFIG(columnview);
 
 QT_BEGIN_NAMESPACE
 
@@ -98,6 +98,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_QCOLUMNVIEW
-
 #endif //QCOLUMNVIEWGRIP_P_H