diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-10 11:26:09 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 11:26:09 +0100 |
| commit | 40cc6dea5b1b5d2570468adcc83943f8c8bd112e (patch) | |
| tree | a314707e11905a9f8bab8d6a93d4532194af371a /Tools/qmake/mkspecs/features/functions.prf | |
| parent | 0b30e4490f7500ade1868fb33cea8705418c90bb (diff) | |
| parent | c176f1fbe8ed0d87c507811f4c0e4d67a71bc890 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
.qmake.conf
Change-Id: Id65b546f295897cd386125d2d3d4160051cc7d22
Diffstat (limited to 'Tools/qmake/mkspecs/features/functions.prf')
| -rw-r--r-- | Tools/qmake/mkspecs/features/functions.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tools/qmake/mkspecs/features/functions.prf b/Tools/qmake/mkspecs/features/functions.prf index dc0c78f97..2f5b87c7c 100644 --- a/Tools/qmake/mkspecs/features/functions.prf +++ b/Tools/qmake/mkspecs/features/functions.prf @@ -293,7 +293,7 @@ defineTest(linkAgainstLibrary) { } defineTest(xlibAvailable) { - contains(QT_CONFIG, xcb-xlib) { + qtConfig(xcb):qtConfig(xcb-xlib) { return(true) } else { return(false) |