diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-16 11:51:48 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-18 10:24:51 +0000 |
| commit | 4de39455cde341998321f9c0c8d8e28394c1796e (patch) | |
| tree | 5a3d5a48c276fc6bcf9f776db238c906fb4be27e /tools/qmake | |
| parent | c7d40732bfeaf151fe27841bfee3d7f3629d2ddc (diff) | |
Update dependencies
Add more pkg-config based libraries that we need to build Qt WebEngine
and update Chromium SHA so that we do not need ATK.
Change-Id: I713823e3dcad9b9f5a112d500d23281ac59c307b
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'tools/qmake')
| -rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 20 | ||||
| -rw-r--r-- | tools/qmake/mkspecs/features/functions.prf | 2 |
2 files changed, 13 insertions, 9 deletions
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) } |