summaryrefslogtreecommitdiffstats
path: root/tools/qmake/mkspecs/features/configure.prf
diff options
context:
space:
mode:
authorMichael Bruning <michael.bruning@theqtcompany.com>2016-05-23 15:02:12 +0200
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-05-23 16:51:11 +0200
commit59d211d8bbb42242ca355a7451b8a66ee5f30dc6 (patch)
treed51ef03184d1b9ef58fde30835a6c014c75b2c6d /tools/qmake/mkspecs/features/configure.prf
parent7933be051938a2815ed44563d26126e5d4a40b06 (diff)
parentad8bc45732eeb2efa6e885d564c10761e7154889 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7.0
Conflicts: src/3rdparty src/core/browser_context_adapter.cpp src/core/web_contents_adapter.cpp src/webengine/doc/src/qtwebengine-platform-notes.qdoc tests/auto/widgets/qwebenginepage/BLACKLIST Change-Id: I768fc954a9a2147fc3669961286163a0a824def3
Diffstat (limited to 'tools/qmake/mkspecs/features/configure.prf')
-rw-r--r--tools/qmake/mkspecs/features/configure.prf2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf
index 679b282b..af87a587 100644
--- a/tools/qmake/mkspecs/features/configure.prf
+++ b/tools/qmake/mkspecs/features/configure.prf
@@ -26,7 +26,7 @@ defineTest(runConfigure) {
!config_khr:skipBuild("khronos development headers appear to be missing (mesa/libegl1-mesa-dev)")
REQUIRED_PACKAGES = dbus-1 fontconfig
- contains(QT_CONFIG, xcb): REQUIRED_PACKAGES += libdrm xcomposite xcursor xi xrandr xscrnsaver xtst
+ !cross_compile: contains(QT_CONFIG, xcb): REQUIRED_PACKAGES += libdrm xcomposite xcursor xi xrandr xscrnsaver xtst
contains(QT_CONFIG, pulseaudio): REQUIRED_PACKAGES += libpulse
contains(QT_CONFIG, system-png): REQUIRED_PACKAGES += libpng
contains(QT_CONFIG, system-harfbuzz): REQUIRED_PACKAGES += harfbuzz