From 8adad2fe09b173ff876895c27884f49804a20bcc Mon Sep 17 00:00:00 2001
From: Nick Shaforostoff <shaforostoff@gmail.com>
Date: Wed, 13 Apr 2016 00:47:50 +0300
Subject: fix build with various QT_NO_* defines

Done-with: Andriy Gerasika <andriy.gerasika@gmail.com>
Change-Id: I90883a491dbddb005c3d756c339e42285d50e437
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/corelib/global/qfeatures.txt             |  6 +++---
 src/corelib/itemmodels/qitemselectionmodel.h | 11 ++++++-----
 src/corelib/statemachine/qabstractstate_p.h  |  8 +++++++-
 src/corelib/statemachine/qhistorystate_p.h   |  6 +++++-
 4 files changed, 21 insertions(+), 10 deletions(-)

(limited to 'src/corelib')

diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt
index dec16eaef1..458f87ec16 100644
--- a/src/corelib/global/qfeatures.txt
+++ b/src/corelib/global/qfeatures.txt
@@ -107,7 +107,7 @@ Name: QSharedMemory
 Feature: SYSTEMSEMAPHORE
 Description: Provides a general counting system semaphore.
 Section: Kernel
-Requires:
+Requires: SHAREDMEMORY
 Name: QSystemSemaphore
 
 Feature: XMLSTREAM
@@ -500,7 +500,7 @@ Name: QColorDialog
 Feature: FILEDIALOG
 Description: Supports a dialog widget for selecting files or directories.
 Section: Dialogs
-Requires: DIRMODEL TREEVIEW COMBOBOX TOOLBUTTON BUTTONGROUP TOOLTIP SPLITTER STACKEDWIDGET PROXYMODEL
+Requires: FILESYSTEMMODEL TREEVIEW COMBOBOX TOOLBUTTON BUTTONGROUP TOOLTIP SPLITTER STACKEDWIDGET PROXYMODEL
 Name: QFileDialog
 
 Feature: FONTDIALOG
@@ -512,7 +512,7 @@ Name: QFontDialog
 Feature: PRINTDIALOG
 Description: Supports a dialog widget for specifying printer configuration.
 Section: Dialogs
-Requires: PRINTER COMBOBOX BUTTONGROUP SPINBOX TREEVIEW TABWIDGET
+Requires: PRINTER COMBOBOX BUTTONGROUP SPINBOX TABWIDGET
 Name: QPrintDialog
 
 Feature: PRINTPREVIEWDIALOG
diff --git a/src/corelib/itemmodels/qitemselectionmodel.h b/src/corelib/itemmodels/qitemselectionmodel.h
index d79b99541e..3d3cb00750 100644
--- a/src/corelib/itemmodels/qitemselectionmodel.h
+++ b/src/corelib/itemmodels/qitemselectionmodel.h
@@ -40,6 +40,10 @@
 #ifndef QITEMSELECTIONMODEL_H
 #define QITEMSELECTIONMODEL_H
 
+#include <QtCore/qglobal.h>
+
+#ifndef QT_NO_ITEMVIEWS
+
 #include <QtCore/qset.h>
 #include <QtCore/qvector.h>
 #include <QtCore/qlist.h>
@@ -47,9 +51,6 @@
 
 QT_BEGIN_NAMESPACE
 
-
-#ifndef QT_NO_ITEMVIEWS
-
 class Q_CORE_EXPORT QItemSelectionRange
 {
 
@@ -272,11 +273,11 @@ Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QItemSelection)
 Q_CORE_EXPORT QDebug operator<<(QDebug, const QItemSelectionRange &);
 #endif
 
-#endif // QT_NO_ITEMVIEWS
-
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QItemSelectionRange)
 Q_DECLARE_METATYPE(QItemSelection)
 
+#endif // QT_NO_ITEMVIEWS
+
 #endif // QITEMSELECTIONMODEL_H
diff --git a/src/corelib/statemachine/qabstractstate_p.h b/src/corelib/statemachine/qabstractstate_p.h
index b5e1b19862..552125f95a 100644
--- a/src/corelib/statemachine/qabstractstate_p.h
+++ b/src/corelib/statemachine/qabstractstate_p.h
@@ -51,6 +51,10 @@
 // We mean it.
 //
 
+#include <QtCore/qglobal.h>
+
+#ifndef QT_NO_STATEMACHINE
+
 #include <private/qobject_p.h>
 #include <QtCore/qabstractstate.h>
 
@@ -94,4 +98,6 @@ public:
 
 QT_END_NAMESPACE
 
-#endif
+#endif // QT_NO_STATEMACHINE
+
+#endif // QABSTRACTSTATE_P_H
diff --git a/src/corelib/statemachine/qhistorystate_p.h b/src/corelib/statemachine/qhistorystate_p.h
index 2e93c31982..ae9ed431cb 100644
--- a/src/corelib/statemachine/qhistorystate_p.h
+++ b/src/corelib/statemachine/qhistorystate_p.h
@@ -53,6 +53,8 @@
 
 #include "private/qabstractstate_p.h"
 
+#ifndef QT_NO_STATEMACHINE
+
 #include <QtCore/qabstracttransition.h>
 #include <QtCore/qhistorystate.h>
 #include <QtCore/qlist.h>
@@ -93,4 +95,6 @@ protected:
 
 QT_END_NAMESPACE
 
-#endif
+#endif // QT_NO_STATEMACHINE
+
+#endif // QHISTORYSTATE_P_H
-- 
cgit v1.2.3