summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-04-08 09:53:39 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-04-08 09:53:39 +0200
commit01a269593d281ae1cacc9cef5c5ccae10d41f03e (patch)
tree4e08108745b41314c6d3b5b35e66f4cb1d0024d9 /src/gui
parente199710d0ea804e4481042f41b91b5234540f5d5 (diff)
parenta0b5d6e60f96359d88352e0b1c000678cdc80988 (diff)
Merge remote-tracking branch 'origin/5.12.3' into 5.12
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/configure.json6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json
index e4f25ab313..6fdcd562a7 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -764,7 +764,8 @@
},
"headers": [ "xkbcommon/xkbcommon.h" ],
"sources": [
- { "type": "pkgConfig", "args": "xkbcommon >= 0.5.0" }
+ { "type": "pkgConfig", "args": "xkbcommon >= 0.5.0" },
+ "-lxkbcommon"
]
},
"xkbcommon_x11": {
@@ -774,7 +775,8 @@
},
"headers": [ "xkbcommon/xkbcommon-x11.h" ],
"sources": [
- { "type": "pkgConfig", "args": "xkbcommon-x11" }
+ { "type": "pkgConfig", "args": "xkbcommon-x11" },
+ "-lxkbcommon -lxkbcommon-x11"
]
},
"xrender": {