blob: 6a2162f4cf5c8757433ad098d0744314ca8161ca (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
From 7d20d5e4584abce2353557c90e79ee0b3cdc330e Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Fri, 27 Feb 2015 19:51:55 +0100
Subject: [PATCH 4/4] configure.prf: don't fail when libcap test fails
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
tools/qmake/mkspecs/features/configure.prf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf
index 6e74b55..b91fde8 100644
--- a/tools/qmake/mkspecs/features/configure.prf
+++ b/tools/qmake/mkspecs/features/configure.prf
@@ -20,7 +20,7 @@ defineTest(runConfigure) {
qtCompileTest($$test)
}
# libcap-dev package doesn't ship .pc files on Ubuntu.
- linux:!config_libcap:skipBuild("libcap appears to be missing")
+ #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")
--
2.3.1
|
