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/shared | |
| 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/shared')
| -rw-r--r-- | src/shared/qwaylandxkb.cpp | 4 | ||||
| -rw-r--r-- | src/shared/qwaylandxkb_p.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/shared/qwaylandxkb.cpp b/src/shared/qwaylandxkb.cpp index 2afdcce8a..3e04467de 100644 --- a/src/shared/qwaylandxkb.cpp +++ b/src/shared/qwaylandxkb.cpp @@ -43,8 +43,6 @@ #include <QKeyEvent> #include <QString> -#ifndef QT_NO_WAYLAND_XKB - #include <xkbcommon/xkbcommon-keysyms.h> QT_BEGIN_NAMESPACE @@ -377,5 +375,3 @@ QVector<xkb_keysym_t> QWaylandXkb::toKeysym(QKeyEvent *event) } QT_END_NAMESPACE - -#endif // QT_NO_WAYLAND_XKB diff --git a/src/shared/qwaylandxkb_p.h b/src/shared/qwaylandxkb_p.h index cdebf1b08..230159fbb 100644 --- a/src/shared/qwaylandxkb_p.h +++ b/src/shared/qwaylandxkb_p.h @@ -41,8 +41,6 @@ #ifndef QWAYLANDXKB_H #define QWAYLANDXKB_H -#ifndef QT_NO_WAYLAND_XKB - #include <Qt> #include <QEvent> #include <xkbcommon/xkbcommon.h> @@ -65,6 +63,4 @@ public: QT_END_NAMESPACE -#endif // QT_NO_WAYLAND_XKB - #endif |