diff options
| author | Michael Bruning <michael.bruning@theqtcompany.com> | 2015-10-26 09:38:25 +0100 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@theqtcompany.com> | 2015-10-26 11:18:52 +0000 |
| commit | e8661d98de22e81db14f43211fe384bb58a32c97 (patch) | |
| tree | c74b43cbb5345b2940012a10b03c2fa8a5df4140 /tools | |
| parent | 427e5bc2d49ea4422eafbcd316c88d0713ac6ea8 (diff) | |
Check if platform is supported first.
The former location of the check at the end of the function caused
misleading error messages about missing features to be printed as the
reason for the skipped build, when actually the whole platform was
not supported by Qt WebEngine.
Change-Id: Ie8ad80b8716b7212ae96ce6ed2e2ab51f396d219
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmake/mkspecs/features/functions.prf | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index 9f54f4f3c..d5265ab00 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -1,4 +1,8 @@ defineTest(isPlatformSupported) { + !linux-g++*:!linux-clang:!win32-msvc2013*:!win32-msvc2015*:!macx-clang*:!boot2qt { + skipBuild("Qt WebEngine can currently only be built for Linux (GCC/clang), Windows (MSVC 2013 or 2015), OS X (10.9/XCode 5.1+) or Qt for Device Creation.") + return(false) + } !contains(QT_CONFIG, c++11) { skipBuild("C++11 support is required in order to build chromium.") return(false) @@ -22,11 +26,7 @@ defineTest(isPlatformSupported) { linux-g++*:!isGCCVersionSupported(): return(false) !isPythonVersionSupported(): return(false) - linux-g++*|linux-clang|win32-msvc2013*|win32-msvc2015*|macx-clang*: return(true) - boot2qt: return(true) - - skipBuild("Qt WebEngine can currently only be built for Linux (GCC/clang), Windows (MSVC 2013 or 2015), OS X (10.9/XCode 5.1+) or Qt for Device Creation.") - return(false) + return(true) } defineTest(isPythonVersionSupported) { |