summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-11-09 13:42:18 +0100
committerSimon Hausmann <simon.hausmann@digia.com>2012-11-09 13:42:18 +0100
commit23037105e948c2065da5a937d3a2396b0ff45c1e (patch)
treefd7b54e975c35e9e947290d1f459a070f30e48bc
parent9b4188281687e49303547ec84e616b03a03e4507 (diff)
downloadqtwebkit-23037105e948c2065da5a937d3a2396b0ff45c1e.tar.gz
2012-11-09 Simon Hausmann <simon.hausmann@digia.com>
Prospective fix for arm cross-compilation on Linux: Don't check for libudev if Qt is configured _not_ to use pkg-config, similar to what we do for gstreamer a few lines above. * qmake/mkspecs/features/features.prf:
-rw-r--r--Tools/qmake/mkspecs/features/features.prf2
1 files changed, 1 insertions, 1 deletions
diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf
index bc285a28e..0aad66021 100644
--- a/Tools/qmake/mkspecs/features/features.prf
+++ b/Tools/qmake/mkspecs/features/features.prf
@@ -121,7 +121,7 @@ defineTest(detectFeatures) {
}
# Gamepad API Support
- packagesExist(libudev): WEBKIT_CONFIG += gamepad
+ !contains(QT_CONFIG, no-pkg-config):packagesExist(libudev): WEBKIT_CONFIG += gamepad
# Support for Graphics Surface
# GraphicsSurface requires GraphicsContext3D and hence use_3d_graphics