diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-16 07:25:49 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-16 07:25:49 +0200 |
| commit | 6e4d1a0cf21ee18d6584042cd9bea3a7d1d24a56 (patch) | |
| tree | 57afb359e42aa922c4ca31666aab1ee7d49c9212 /tools/qmake/mkspecs | |
| parent | 765f9c6630afcd9d022e30ffdbe909fbf1ea9549 (diff) | |
| parent | b7fde78d7822ed7f2221acfd9db15b3ff579e29d (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty
src/webengine/api/qquickwebenginecertificateerror.cpp
src/webengine/doc/src/webengineview.qdoc
tools/qmake/config.tests/libcap/libcap.cpp
Change-Id: I2a2cfc904a8d6b561fb71ef7a0cc4bfb860124db
Diffstat (limited to 'tools/qmake/mkspecs')
| -rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 2 | ||||
| -rw-r--r-- | tools/qmake/mkspecs/features/functions.prf | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index cb6fb8fda..6a67bf097 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -21,8 +21,6 @@ defineTest(runConfigure) { } 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 diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index 20fb27817..cd4f4a007 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -46,6 +46,10 @@ defineTest(isPlatformSupported) { skipBuild("C++11 support is required in order to build chromium.") return(false) } + contains(QT_CONFIG, mirclient) { + skipBuild("Mir is not yet supported as graphics backend for Qt WebEngine.") + return(false) + } static { skipBuild("Static builds of QtWebEngine aren't supported.") return(false) |