diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-16 22:07:23 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-16 22:07:33 +0200 |
commit | ac41ad48cacac91e428181f7ededb0896ee64c40 (patch) | |
tree | 44b4afb881fd0b7aa29b0a9da22dddf8e91a4be2 /tools/qmake/mkspecs | |
parent | 6534b09073791398bad99863821740e986915bff (diff) | |
parent | 6e4d1a0cf21ee18d6584042cd9bea3a7d1d24a56 (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Id5f97771be23a4393e8d3be98903c321377ae809
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 044fa94aa..9663c1072 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 ab9593bf9..c8c8e0cc8 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -50,6 +50,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) |