path: root/src/3rdparty/xkbcommon.pri
diff options
authorLars Knoll <>2016-08-18 22:25:08 +0200
committerLars Knoll <>2016-08-19 04:27:29 +0000
commit56ee007b3f44eb3276b244a630f55482c2b02228 (patch)
tree349a978e664592f51d26563603219e5a537d3cfc /src/3rdparty/xkbcommon.pri
parent606924132ff1f11b9d7b4357251f07ccabb8bdb6 (diff)
Rework privateFeature
privateFeature would add QT_NO_FEATURE to the DEFINES in the private .pri file, which was somewhat inelegant. Additionally, it would add the feature to the _public_ QT_CONFIG variable, which was plain wrong. Replace the implementation with the one just introduced for publicFeature, with the difference that the features are written to the private files instead. As this entirely disposes of the old system, all usages in the project files need to be replaced atomically as well. Change-Id: I506b5d41054410659ea503bc6901736cd5edec6e Reviewed-by: Lars Knoll <> Reviewed-by: Oswald Buddenhagen <>
Diffstat (limited to 'src/3rdparty/xkbcommon.pri')
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/xkbcommon.pri b/src/3rdparty/xkbcommon.pri
index eaef4749db..cfffa97369 100644
--- a/src/3rdparty/xkbcommon.pri
+++ b/src/3rdparty/xkbcommon.pri
@@ -47,7 +47,7 @@ SOURCES += \
$$PWD/xkbcommon/src/xkbcomp/xkbcomp.c \
-!contains(DEFINES, QT_NO_XKB):contains(QT_CONFIG, use-xkbcommon-x11support): {
+qtConfig(xkb):contains(QT_CONFIG, use-xkbcommon-x11support): {
# Build xkbcommon-x11 support library, it depends on -lxcb and -lxcb-xkb, linking is done
# in (linked to system libraries or if Qt was configured with -qt-xcb then
# linked to -lxcb-static).