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/client.pro | |
| 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/client.pro')
| -rw-r--r-- | src/client/client.pro | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/client/client.pro b/src/client/client.pro index 749e3b6a3..7482cfd6b 100644 --- a/src/client/client.pro +++ b/src/client/client.pro @@ -15,15 +15,8 @@ use_gold_linker: CONFIG += no_linker_version_script CONFIG -= precompile_header CONFIG += link_pkgconfig wayland-scanner -qtConfig(opengl) { - DEFINES += QT_WAYLAND_GL_SUPPORT -} - -qtConfig(xkbcommon-evdev) { +qtConfig(xkbcommon-evdev): \ QMAKE_USE_PRIVATE += xkbcommon_evdev -} else { - DEFINES += QT_NO_WAYLAND_XKB -} QMAKE_USE += wayland-client wayland-cursor @@ -108,7 +101,8 @@ HEADERS += qwaylandintegration_p.h \ qwaylandinputcontext_p.h \ qwaylanddatadevice_p.h \ qwaylandshm_p.h \ - qwaylandclientexport.h \ + qtwaylandclientglobal.h \ + qtwaylandclientglobal_p.h \ ../shared/qwaylandinputmethodeventbuilder_p.h \ ../shared/qwaylandmimehelper_p.h \ ../shared/qwaylandxkb_p.h \ |