summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/configure.prf
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2017-10-24 18:51:42 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-11-12 00:10:48 +0000
commit2ed1e0ba423a75f68c1547fe0c06e62e773ef64d (patch)
tree51878b13727572eec3fa89162e2a643dea84db2b /mkspecs/features/configure.prf
parentbb5a158ff01a02dbd9838094f57e0a429c248411 (diff)
Add 'webengine' prefix to configure features, tests, libraries, etc
This is done to make sure there are no conflicts with features in other modules, because they all share a global namespace. Change-Id: I95b3b7fadd8ffc2979ee3aad2234ee543d57c7d8 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'mkspecs/features/configure.prf')
-rw-r--r--mkspecs/features/configure.prf18
1 files changed, 9 insertions, 9 deletions
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
index ed9882735..904e7b1c0 100644
--- a/mkspecs/features/configure.prf
+++ b/mkspecs/features/configure.prf
@@ -30,19 +30,19 @@ defineTest(runConfigure) {
include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
QT_FOR_CONFIG += webengine-private
- !qtConfig(gperf) {
+ !qtConfig(webengine-gperf) {
skipBuild("Required gperf could not be found.")
return(false)
}
- !qtConfig(bison) {
+ !qtConfig(webengine-bison) {
skipBuild("Required bison could not be found.")
return(false)
}
- !qtConfig(flex) {
+ !qtConfig(webengine-flex) {
skipBuild("Required flex could not be found.")
return(false)
}
- !qtConfig(python2) {
+ !qtConfig(webengine-python2) {
skipBuild("A suitable version of python2 could not be found.")
return(false)
}
@@ -53,28 +53,28 @@ defineTest(runConfigure) {
}
linux {
- !qtConfig(system-glibc) {
+ !qtConfig(webengine-system-glibc) {
skipBuild("A suitable version of libc could not be found. See: https://sourceware.org/bugzilla/show_bug.cgi?id=14898")
return(false)
}
QT_FOR_CONFIG += gui-private
- !qtConfig(system-khr) {
+ !qtConfig(webengine-system-khr) {
skipBuild("khronos development headers appear to be missing (mesa/libegl1-mesa-dev)")
return(false)
}
for(package, $$list("nss dbus fontconfig")) {
- !qtConfig(system-$$package) {
+ !qtConfig(webengine-system-$$package) {
skipBuild("A suitable version of $$package could not be found.")
return(false)
}
}
- !qtConfig(embedded): qtConfig(xcb) {
+ !qtConfig(webengine-embedded-build): qtConfig(xcb) {
for(package, $$list("libdrm xcomposite xcursor xi xrandr xtst")) {
- !qtConfig(system-$$package) {
+ !qtConfig(webengine-system-$$package) {
skipBuild("A suitable version of $$package could not be found.")
return(false)
}