summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/configure.prf18
-rw-r--r--mkspecs/features/functions.prf2
-rw-r--r--mkspecs/features/platform.prf2
3 files changed, 11 insertions, 11 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)
}
diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
index c15b5118d..3b9a400b1 100644
--- a/mkspecs/features/functions.prf
+++ b/mkspecs/features/functions.prf
@@ -78,7 +78,7 @@ defineReplace(gnPath) {
defineReplace(gnArgs) {
linux {
- qtConfig(embedded): include($$QTWEBENGINE_ROOT/src/core/config/embedded_linux.pri)
+ qtConfig(webengine-embedded-build): include($$QTWEBENGINE_ROOT/src/core/config/embedded_linux.pri)
else: include($$QTWEBENGINE_ROOT/src/core/config/desktop_linux.pri)
}
macos: include($$QTWEBENGINE_ROOT/src/core/config/mac_osx.pri)
diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf
index 0b0bb6746..bb171f753 100644
--- a/mkspecs/features/platform.prf
+++ b/mkspecs/features/platform.prf
@@ -33,7 +33,7 @@ defineTest(isPlatformSupported) {
skipBuild("Qt WebEngine on Windows requires a Windows SDK version 10.0.10586 or newer.")
return(false)
}
- !qtConfig(winversion) {
+ !qtConfig(webengine-winversion) {
skipBuild("Needs VS 2015 Update 3 with Cumulative Servicing Release or higher")
return(false)
}