summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/xkbcommon.pri
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-15 22:39:25 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-15 22:39:25 +0200
commite5bcf68d3055d6738b56cbbafb407bad4363e63c (patch)
treed70319316c926697e136527ce9a6628d34f0ebc4 /src/3rdparty/xkbcommon.pri
parentd57d184b6d18deab172ac400b9db973e6aacab21 (diff)
parentbe4b80af8235d5f5664f03589258eec0e43da78b (diff)
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Diffstat (limited to 'src/3rdparty/xkbcommon.pri')
-rw-r--r--src/3rdparty/xkbcommon.pri2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/xkbcommon.pri b/src/3rdparty/xkbcommon.pri
index 99536576f7..d437c6b8b6 100644
--- a/src/3rdparty/xkbcommon.pri
+++ b/src/3rdparty/xkbcommon.pri
@@ -1,4 +1,4 @@
-QMAKE_CFLAGS = -std=gnu99 -w
+QMAKE_CFLAGS += -std=gnu99 -w
INCLUDEPATH += $$PWD/xkbcommon $$PWD/xkbcommon/src $$PWD/xkbcommon/src/xkbcomp
DEFINES += DFLT_XKB_CONFIG_ROOT='\\"/usr/share/X11/xkb\\"'