diff options
author | Pierre Rossi <pierre.rossi@theqtcompany.com> | 2015-01-12 18:56:52 +0100 |
---|---|---|
committer | Michael BrĂ¼ning <michael.bruning@theqtcompany.com> | 2015-01-16 14:39:29 +0100 |
commit | ae657b918ff22da2553dc577c877b03f49cc2bdf (patch) | |
tree | b43600a9d5ff9acc893581c8dc5226d34632dc6a /tools/qmake/mkspecs | |
parent | 1364ba04b2df4e91d8f648fb02e0c19dcac1ab30 (diff) |
Add additional dependency checks
For dependencies that have caused trouble before, such
as libdrm.
Task-number: QTBUG-41516
Change-Id: I0cee98282e93460971471796a65a43be4750c6b0
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'tools/qmake/mkspecs')
-rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index d0cb50877..6e74b5547 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -4,6 +4,10 @@ load(functions) defineTest(runConfigure) { webengine_successfully_configured: return(true) + linux:contains(QT_CONFIG,no-pkg-config) { + skipBuild("pkg-config is required") + return(false) + } # Ignore the cached config tests results in case they were not successful CONFIG += recheck #Override the config.tests path @@ -17,7 +21,11 @@ defineTest(runConfigure) { } # libcap-dev package doesn't ship .pc files on Ubuntu. linux:!config_libcap:skipBuild("libcap appears to be missing") - + contains(QT_CONFIG, xcb) { + for(package, $$list("libdrm xcomposite xi xrandr")) { + !packagesExist($$package):skipBuild("Unmet dependency: $$package") + } + } isEmpty(skipBuildReason):cache(CONFIG, add, $$list(webengine_successfully_configured)) } |