diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-11-15 15:59:13 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-11-23 08:42:05 +0000 |
| commit | 2333c58fff009435503c3b7ef3d86569227056eb (patch) | |
| tree | c98fd555af28f6324b24a3884bc8f40fa18bde24 /src/client/hardwareintegration | |
| parent | 1d5b44cbb1e834bc8db94d8ec1ac140b8ca9ed37 (diff) | |
Use the feature system internally
Get rid of almost all DEFINES += ... in the pro files,
instead use the proper QT_CONFIG() macro to determine
whether a feature is available.
Change-Id: I867769be2085c6ba93b6815e223e2b89edcb245d
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/client/hardwareintegration')
7 files changed, 7 insertions, 7 deletions
diff --git a/src/client/hardwareintegration/qwaylandclientbufferintegration_p.h b/src/client/hardwareintegration/qwaylandclientbufferintegration_p.h index adaf2902a..f1f0cf932 100644 --- a/src/client/hardwareintegration/qwaylandclientbufferintegration_p.h +++ b/src/client/hardwareintegration/qwaylandclientbufferintegration_p.h @@ -52,7 +52,7 @@ // #include <QtCore/qglobal.h> -#include <QtWaylandClient/qwaylandclientexport.h> +#include <QtWaylandClient/qtwaylandclientglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h b/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h index c70a2bd56..7eaeed16c 100644 --- a/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h +++ b/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtWaylandClient/qwaylandclientexport.h> +#include <QtWaylandClient/qtwaylandclientglobal.h> #include <QtCore/QStringList> QT_BEGIN_NAMESPACE diff --git a/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h b/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h index 2830f95fa..6496b33ed 100644 --- a/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h +++ b/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtWaylandClient/qwaylandclientexport.h> +#include <QtWaylandClient/qtwaylandclientglobal.h> #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> diff --git a/src/client/hardwareintegration/qwaylandhardwareintegration_p.h b/src/client/hardwareintegration/qwaylandhardwareintegration_p.h index db9e19ac9..8b4a71629 100644 --- a/src/client/hardwareintegration/qwaylandhardwareintegration_p.h +++ b/src/client/hardwareintegration/qwaylandhardwareintegration_p.h @@ -52,7 +52,7 @@ // #include <QtWaylandClient/private/qwayland-hardware-integration.h> -#include <QtWaylandClient/qwaylandclientexport.h> +#include <QtWaylandClient/qtwaylandclientglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/client/hardwareintegration/qwaylandserverbufferintegration_p.h b/src/client/hardwareintegration/qwaylandserverbufferintegration_p.h index e3943da80..67f857db8 100644 --- a/src/client/hardwareintegration/qwaylandserverbufferintegration_p.h +++ b/src/client/hardwareintegration/qwaylandserverbufferintegration_p.h @@ -55,7 +55,7 @@ #include <QtGui/qopengl.h> #include <QtWaylandClient/private/qwayland-server-buffer-extension.h> -#include <QtWaylandClient/qwaylandclientexport.h> +#include <QtWaylandClient/qtwaylandclientglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h b/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h index f17856208..600c24c9b 100644 --- a/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h +++ b/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtWaylandClient/qwaylandclientexport.h> +#include <QtWaylandClient/qtwaylandclientglobal.h> #include <QtCore/QStringList> QT_BEGIN_NAMESPACE diff --git a/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h b/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h index 7eaaa1700..b3ed3ccc5 100644 --- a/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h +++ b/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtWaylandClient/qwaylandclientexport.h> +#include <QtWaylandClient/qtwaylandclientglobal.h> #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> |