diff options
author | Kai Koehne <kai.koehne@theqtcompany.com> | 2016-01-04 15:40:06 +0100 |
---|---|---|
committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2016-01-26 13:27:32 +0000 |
commit | 7d453a0526fdc001b8af826756030cc571110403 (patch) | |
tree | 1fe4d7a7101f657bd9c0db01a090a923485acfb9 /tools | |
parent | 4dd8ea5f3a2e062f64206016d0ec3005b0d036f6 (diff) |
Allow build on all Linux platforms
Support also irregular mkspec names like linux-imx6-g++. We
officially only support boot2qt for embedded Linux, but that's
no reason to prevent builing on other configurations. Also,
the line between embedded and Desktop Linux is blurry.
Task-number: QTBUG-49249
Task-number: QTBUG-50259
Change-Id: If5b87a21bb226194c8340430be958d42ae80b537
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/qmake/mkspecs/features/functions.prf | 46 |
1 files changed, 30 insertions, 16 deletions
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index 2447d8372..e9d801e51 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -1,30 +1,44 @@ 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) - } - static { - skipBuild("Static builds of QtWebEngine aren't supported.") - return(false) - } - osx { + linux { + !gcc:!clang { + skipBuild("Qt WebEngine on Linux requires clang or GCC.") + return(false) + } + gcc:!clang:!isGCCVersionSupported(): return(false) + } else:win32 { + msvc { + !equals(MSVC_VER, "12.0"):!equals(MSVC_VER, "14.0") { + skipBuild("Qt WebEngine on Windows requires MSVC 2013 or MSVC 2015.") + return(false) + } + } else { + skipBuild("Qt WebEngine on Windows requires MSVC 2013 or MSVC 2015.") + return(false) + } + } else:osx { lessThan(QMAKE_XCODE_VERSION, 5.1) { - skipBuild("Using xcode version $$QMAKE_XCODE_VERSION, but at least version 5.1 is required to build Qt WebEngine.") + skipBuild("Using XCode version $$QMAKE_XCODE_VERSION, but at least version 5.1 is required to build Qt WebEngine.") return(false) } # We require OS X 10.9 (darwin version 13.0.0) or newer darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0) lessThan(darwin_major_version, 13) { - skipBuild("OS X version 10.9 or newer is required to build Qt WebEngine.") + skipBuild("Qt WebEngine requires OS X version 10.9 or newer.") return(false) } + } else { + skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and OS X.") + return(false) } - linux-g++*:!isGCCVersionSupported(): return(false) + !contains(QT_CONFIG, c++11) { + skipBuild("C++11 support is required in order to build chromium.") + return(false) + } + static { + skipBuild("Static builds of QtWebEngine aren't supported.") + return(false) + } !isPythonVersionSupported(): return(false) return(true) } |