diff options
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 20 | ||||
| -rw-r--r-- | tools/qmake/mkspecs/features/functions.prf | 2 |
3 files changed, 13 insertions, 9 deletions
diff --git a/src/3rdparty b/src/3rdparty -Subproject 8a2ae40fde77efb717668abedc5f0c9e28cd86b +Subproject 2ac2926e6c73bbb9b9897ed6d7a472031a0a8c6 diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index 17bdc8ba1..5d6695dc3 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -19,16 +19,20 @@ defineTest(runConfigure) { test ~= s/\\.pro$// qtCompileTest($$test) } - # libcap-dev package doesn't ship .pc files on Ubuntu. - linux:!config_libcap:skipBuild("libcap development package appears to be missing") - linux:!config_khr:skipBuild("khronos development headers appear to be missing (mesa/libegl1-mesa-dev)") - contains(QT_CONFIG, xcb) { - for(package, $$list("libdrm xcomposite xi xrandr xscrnsaver")) { - !packagesExist($$package):skipBuild("Unmet dependency: $$package") - } - } linux { + # libcap-dev package doesn't ship .pc files on Ubuntu. + !config_libcap:skipBuild("libcap development package appears to be missing") + !config_khr:skipBuild("khronos development headers appear to be missing (mesa/libegl1-mesa-dev)") + + REQUIRED_PACKAGES = dbus-1 fontconfig + contains(QT_CONFIG, xcb): REQUIRED_PACKAGES += libdrm xcomposite xcursor xi xrandr xscrnsaver xtst + contains(QT_CONFIG, pulseaudio): REQUIRED_PACKAGES += libpulse + !cross_compile: REQUIRED_PACKAGES += libpci nss + + for(package, $$list($$REQUIRED_PACKAGES)) { + !packagesExist($$package):skipBuild("Unmet dependency: $$package") + } packagesExist(minizip, zlib): WEBENGINE_CONFIG += config_system_minizip else: log("System zlib or minizip not found. Using Chromium's copies.$${EOL}") packagesExist(libwebp,libwebpdemux): WEBENGINE_CONFIG += config_system_libwebp diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index 417f81925..0fda473c9 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -17,7 +17,7 @@ defineTest(isPlatformSupported) { linux-g++*|linux-clang|win32-msvc2013|macx-clang: return(true) boot2qt: return(true) - skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.") + skipBuild("Qt WebEngine can currently only be built for Linux (GCC/clang), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.") return(false) } |