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/compositor/hardware_integration | |
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/compositor/hardware_integration')
7 files changed, 7 insertions, 9 deletions
diff --git a/src/compositor/hardware_integration/hardware_integration.pri b/src/compositor/hardware_integration/hardware_integration.pri index 624190a6e..dd892e07a 100644 --- a/src/compositor/hardware_integration/hardware_integration.pri +++ b/src/compositor/hardware_integration/hardware_integration.pri @@ -1,4 +1,4 @@ -contains(QT_CONFIG, opengl) { +qtConfig(opengl) { CONFIG += wayland-scanner WAYLANDSERVERSOURCES += \ ../extensions/server-buffer-extension.xml \ @@ -21,8 +21,6 @@ contains(QT_CONFIG, opengl) { hardware_integration/qwlserverbufferintegrationfactory.cpp \ hardware_integration/qwlserverbufferintegrationplugin.cpp \ hardware_integration/qwlhwintegration.cpp \ - - DEFINES += QT_WAYLAND_COMPOSITOR_GL } else { system(echo "Qt-Compositor configured as raster only compositor") } diff --git a/src/compositor/hardware_integration/qwlclientbufferintegration_p.h b/src/compositor/hardware_integration/qwlclientbufferintegration_p.h index a7de2c0e3..c4bed1002 100644 --- a/src/compositor/hardware_integration/qwlclientbufferintegration_p.h +++ b/src/compositor/hardware_integration/qwlclientbufferintegration_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtWaylandCompositor/qwaylandexport.h> +#include <QtWaylandCompositor/qtwaylandcompositorglobal.h> #include <QtWaylandCompositor/qwaylandsurface.h> #include <QtWaylandCompositor/qwaylandbufferref.h> #include <QtCore/QSize> diff --git a/src/compositor/hardware_integration/qwlclientbufferintegrationfactory_p.h b/src/compositor/hardware_integration/qwlclientbufferintegrationfactory_p.h index 3c1d856c7..1ed99083b 100644 --- a/src/compositor/hardware_integration/qwlclientbufferintegrationfactory_p.h +++ b/src/compositor/hardware_integration/qwlclientbufferintegrationfactory_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtWaylandCompositor/qwaylandexport.h> +#include <QtWaylandCompositor/qtwaylandcompositorglobal.h> #include <QtCore/QStringList> QT_BEGIN_NAMESPACE diff --git a/src/compositor/hardware_integration/qwlclientbufferintegrationplugin_p.h b/src/compositor/hardware_integration/qwlclientbufferintegrationplugin_p.h index d8bc33fbe..e8fca43f6 100644 --- a/src/compositor/hardware_integration/qwlclientbufferintegrationplugin_p.h +++ b/src/compositor/hardware_integration/qwlclientbufferintegrationplugin_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtWaylandCompositor/qwaylandexport.h> +#include <QtWaylandCompositor/qtwaylandcompositorglobal.h> #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> diff --git a/src/compositor/hardware_integration/qwlserverbufferintegration_p.h b/src/compositor/hardware_integration/qwlserverbufferintegration_p.h index 3a71f18f7..9a1287fa4 100644 --- a/src/compositor/hardware_integration/qwlserverbufferintegration_p.h +++ b/src/compositor/hardware_integration/qwlserverbufferintegration_p.h @@ -52,7 +52,7 @@ #include <QtCore/QSize> #include <QtGui/qopengl.h> -#include <QtWaylandCompositor/qwaylandexport.h> +#include <QtWaylandCompositor/qtwaylandcompositorglobal.h> struct wl_client; struct wl_resource; diff --git a/src/compositor/hardware_integration/qwlserverbufferintegrationfactory_p.h b/src/compositor/hardware_integration/qwlserverbufferintegrationfactory_p.h index b29ddd041..15d54a292 100644 --- a/src/compositor/hardware_integration/qwlserverbufferintegrationfactory_p.h +++ b/src/compositor/hardware_integration/qwlserverbufferintegrationfactory_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtWaylandCompositor/qwaylandexport.h> +#include <QtWaylandCompositor/qtwaylandcompositorglobal.h> #include <QtCore/QStringList> QT_BEGIN_NAMESPACE diff --git a/src/compositor/hardware_integration/qwlserverbufferintegrationplugin_p.h b/src/compositor/hardware_integration/qwlserverbufferintegrationplugin_p.h index fc8c3bf1e..6c144d74c 100644 --- a/src/compositor/hardware_integration/qwlserverbufferintegrationplugin_p.h +++ b/src/compositor/hardware_integration/qwlserverbufferintegrationplugin_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtWaylandCompositor/qwaylandexport.h> +#include <QtWaylandCompositor/qtwaylandcompositorglobal.h> #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> |