make use of QT_REQUIRE_CONFIG() in platformsupport modules

Change-Id: I26fbe75c65c10d68454e64e306f7155367e66cf6
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

12 files changed, 28 insertions, 29 deletions

diff --git a/src/platformsupport/accessibility/accessibility.pro b/src/platformsupport/accessibility/accessibility.pro
index 49be899b08..5004dc8cbe 100644
--- a/src/platformsupport/accessibility/accessibility.pro
+++ b/src/platformsupport/accessibility/accessibility.pro
@@ -1,7 +1,7 @@
 TARGET = QtAccessibilitySupport
 MODULE = accessibility_support
 
-QT = core-private gui
+QT = core-private gui-private
 CONFIG += static internal_module
 
 DEFINES += QT_NO_CAST_FROM_ASCII
diff --git a/src/platformsupport/accessibility/qaccessiblebridgeutils.cpp b/src/platformsupport/accessibility/qaccessiblebridgeutils.cpp
index 935cff3e6c..f280e65c29 100644
--- a/src/platformsupport/accessibility/qaccessiblebridgeutils.cpp
+++ b/src/platformsupport/accessibility/qaccessiblebridgeutils.cpp
@@ -39,8 +39,6 @@
 #include "qaccessiblebridgeutils_p.h"
 #include <QtCore/qmath.h>
 
-#ifndef QT_NO_ACCESSIBILITY
-
 QT_BEGIN_NAMESPACE
 
 namespace QAccessibleBridgeUtils {
@@ -113,5 +111,3 @@ bool performEffectiveAction(QAccessibleInterface *iface, const QString &actionNa
 }   //namespace
 
 QT_END_NAMESPACE
-
-#endif
diff --git a/src/platformsupport/accessibility/qaccessiblebridgeutils_p.h b/src/platformsupport/accessibility/qaccessiblebridgeutils_p.h
index 79b153a749..cf8e126894 100644
--- a/src/platformsupport/accessibility/qaccessiblebridgeutils_p.h
+++ b/src/platformsupport/accessibility/qaccessiblebridgeutils_p.h
@@ -51,10 +51,12 @@
 // We mean it.
 //
 
+#include <QtGui/private/qtguiglobal_p.h>
+
 #include <QtCore/qstringlist.h>
 #include <QtGui/qaccessible.h>
 
-#ifndef QT_NO_ACCESSIBILITY
+QT_REQUIRE_CONFIG(accessibility);
 
 QT_BEGIN_NAMESPACE
 
@@ -65,6 +67,4 @@ namespace QAccessibleBridgeUtils {
 
 QT_END_NAMESPACE
 
-#endif
-
 #endif //QACCESSIBLEBRIDGEUTILS_H
diff --git a/src/platformsupport/linuxaccessibility/application_p.h b/src/platformsupport/linuxaccessibility/application_p.h
index 2e6d7a78c1..9c053b253c 100644
--- a/src/platformsupport/linuxaccessibility/application_p.h
+++ b/src/platformsupport/linuxaccessibility/application_p.h
@@ -51,12 +51,13 @@
 // We mean it.
 //
 
+#include <QtGui/private/qtguiglobal_p.h>
 #include <QtCore/QPointer>
 #include <QtCore/QQueue>
 #include <QtDBus/QDBusConnection>
 #include <QtGui/QAccessibleInterface>
 
-#ifndef QT_NO_ACCESSIBILITY
+QT_REQUIRE_CONFIG(accessibility);
 
 QT_BEGIN_NAMESPACE
 
@@ -94,6 +95,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif //QT_NO_ACCESSIBILITY
-
 #endif
diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor_p.h b/src/platformsupport/linuxaccessibility/atspiadaptor_p.h
index 87bdbe4bb6..b5704f53ad 100644
--- a/src/platformsupport/linuxaccessibility/atspiadaptor_p.h
+++ b/src/platformsupport/linuxaccessibility/atspiadaptor_p.h
@@ -54,6 +54,7 @@
 
 #include <atspi/atspi-constants.h>
 
+#include <QtGui/private/qtguiglobal_p.h>
 #include <QtCore/qsharedpointer.h>
 #include <QtDBus/qdbusvirtualobject.h>
 #include <QtGui/qaccessible.h>
@@ -61,7 +62,8 @@
 #include "dbusconnection_p.h"
 #include "struct_marshallers_p.h"
 
-#ifndef QT_NO_ACCESSIBILITY
+QT_REQUIRE_CONFIG(accessibility);
+
 QT_BEGIN_NAMESPACE
 
 class QAccessibleInterface;
@@ -222,6 +224,5 @@ private:
 };
 
 QT_END_NAMESPACE
-#endif //QT_NO_ACCESSIBILITY
 
 #endif
diff --git a/src/platformsupport/linuxaccessibility/bridge_p.h b/src/platformsupport/linuxaccessibility/bridge_p.h
index 44dfa82f5d..1e435ca351 100644
--- a/src/platformsupport/linuxaccessibility/bridge_p.h
+++ b/src/platformsupport/linuxaccessibility/bridge_p.h
@@ -52,12 +52,14 @@
 // We mean it.
 //
 
+#include <QtGui/private/qtguiglobal_p.h>
 #include <QtDBus/qdbusconnection.h>
 #include <qpa/qplatformaccessibility.h>
 
 class DeviceEventControllerAdaptor;
 
-#ifndef QT_NO_ACCESSIBILITY
+QT_REQUIRE_CONFIG(accessibility);
+
 QT_BEGIN_NAMESPACE
 
 class DBusConnection;
@@ -89,6 +91,5 @@ private:
 };
 
 QT_END_NAMESPACE
-#endif //QT_NO_ACCESSIBILITY
 
 #endif
diff --git a/src/platformsupport/linuxaccessibility/cache_p.h b/src/platformsupport/linuxaccessibility/cache_p.h
index f141785301..e8529b779b 100644
--- a/src/platformsupport/linuxaccessibility/cache_p.h
+++ b/src/platformsupport/linuxaccessibility/cache_p.h
@@ -52,10 +52,12 @@
 // We mean it.
 //
 
+#include <QtGui/private/qtguiglobal_p.h>
 #include <QtCore/QObject>
 #include "struct_marshallers_p.h"
 
-#ifndef QT_NO_ACCESSIBILITY
+QT_REQUIRE_CONFIG(accessibility);
+
 QT_BEGIN_NAMESPACE
 
 class QSpiDBusCache : public QObject
@@ -76,6 +78,5 @@ public Q_SLOTS:
 };
 
 QT_END_NAMESPACE
-#endif //QT_NO_ACCESSIBILITY
 
 #endif /* Q_SPI_CACHE_H */
diff --git a/src/platformsupport/linuxaccessibility/constant_mappings_p.h b/src/platformsupport/linuxaccessibility/constant_mappings_p.h
index a096261da6..4da818c8c1 100644
--- a/src/platformsupport/linuxaccessibility/constant_mappings_p.h
+++ b/src/platformsupport/linuxaccessibility/constant_mappings_p.h
@@ -58,10 +58,11 @@
 
 #include "struct_marshallers_p.h"
 
+#include <QtGui/private/qtguiglobal_p.h>
 #include <QtGui/QAccessible>
 #include <atspi/atspi-constants.h>
 
-#ifndef QT_NO_ACCESSIBILITY
+QT_REQUIRE_CONFIG(accessibility);
 
 // interface names from at-spi2-core/atspi/atspi-misc-private.h
 #define ATSPI_DBUS_NAME_REGISTRY "org.a11y.atspi.Registry"
@@ -141,6 +142,5 @@ QSpiUIntList spiStateSetFromSpiStates(quint64 states);
 AtspiRelationType qAccessibleRelationToAtSpiRelation(QAccessible::Relation relation);
 
 QT_END_NAMESPACE
-#endif //QT_NO_ACCESSIBILITY
 
 #endif /* Q_SPI_CONSTANT_MAPPINGS_H */
diff --git a/src/platformsupport/linuxaccessibility/struct_marshallers_p.h b/src/platformsupport/linuxaccessibility/struct_marshallers_p.h
index 28d96ec5ea..c8cc05ab5b 100644
--- a/src/platformsupport/linuxaccessibility/struct_marshallers_p.h
+++ b/src/platformsupport/linuxaccessibility/struct_marshallers_p.h
@@ -52,13 +52,15 @@
 // We mean it.
 //
 
+#include <QtGui/private/qtguiglobal_p.h>
 #include <QtCore/qvector.h>
 #include <QtCore/qpair.h>
 #include <QtDBus/QDBusArgument>
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusObjectPath>
 
-#ifndef QT_NO_ACCESSIBILITY
+QT_REQUIRE_CONFIG(accessibility);
+
 QT_BEGIN_NAMESPACE
 
 typedef QVector<int> QSpiIntList;
@@ -192,5 +194,4 @@ Q_DECLARE_METATYPE(QSpiAttributeSet)
 Q_DECLARE_METATYPE(QSpiAppUpdate)
 Q_DECLARE_METATYPE(QSpiDeviceEvent)
 
-#endif //QT_NO_ACCESSIBILITY
 #endif /* Q_SPI_STRUCT_MARSHALLERS_H */
diff --git a/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h b/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h
index a383ef86fc..234ff60584 100644
--- a/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h
+++ b/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h
@@ -52,9 +52,9 @@
 // We mean it.
 //
 
-#include <QtCore/qglobal.h>
+#include <QtGui/private/qtguiglobal_p.h>
 
-#ifndef QT_NO_SYSTEMTRAYICON
+QT_REQUIRE_CONFIG(systemtrayicon);
 
 #include <QIcon>
 #include <QTemporaryFile>
@@ -165,5 +165,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_SYSTEMTRAYICON
 #endif // QDBUSTRAYICON_H
diff --git a/src/platformsupport/themes/genericunix/dbustray/qdbustraytypes_p.h b/src/platformsupport/themes/genericunix/dbustray/qdbustraytypes_p.h
index 1bdc855c3c..3f75555579 100644
--- a/src/platformsupport/themes/genericunix/dbustray/qdbustraytypes_p.h
+++ b/src/platformsupport/themes/genericunix/dbustray/qdbustraytypes_p.h
@@ -52,7 +52,9 @@
 // We mean it.
 //
 
-#ifndef QT_NO_SYSTEMTRAYICON
+#include <QtGui/private/qtguiglobal_p.h>
+
+QT_REQUIRE_CONFIG(systemtrayicon);
 
 #include <QObject>
 #include <QString>
@@ -104,5 +106,4 @@ Q_DECLARE_METATYPE(QXdgDBusImageStruct)
 Q_DECLARE_METATYPE(QXdgDBusImageVector)
 Q_DECLARE_METATYPE(QXdgDBusToolTipStruct)
 
-#endif // QT_NO_SYSTEMTRAYICON
 #endif // QDBUSTRAYTYPES_P_H
diff --git a/src/platformsupport/themes/genericunix/dbustray/qstatusnotifieritemadaptor_p.h b/src/platformsupport/themes/genericunix/dbustray/qstatusnotifieritemadaptor_p.h
index 776e1b23ef..3f8fca7ac0 100644
--- a/src/platformsupport/themes/genericunix/dbustray/qstatusnotifieritemadaptor_p.h
+++ b/src/platformsupport/themes/genericunix/dbustray/qstatusnotifieritemadaptor_p.h
@@ -62,9 +62,9 @@
 // We mean it.
 //
 
-#include <QtCore/qglobal.h>
+#include <QtGui/private/qtguiglobal_p.h>
 
-#ifndef QT_NO_SYSTEMTRAYICON
+QT_REQUIRE_CONFIG(systemtrayicon);
 
 #include <QtCore/QObject>
 #include <QtDBus/QtDBus>
@@ -200,5 +200,5 @@ private:
 };
 
 QT_END_NAMESPACE
-#endif // QT_NO_SYSTEMTRAYICON
+
 #endif // QSTATUSNOTIFIERITEMADAPTER_P_H