diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-12-04 17:01:26 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-12-08 13:20:59 +0100 |
| commit | 3215168f0dc1dee1064d9063b2748e64cc2577bc (patch) | |
| tree | a2e46978e5aadc80636b5e6a7b58050677f90485 /configure.pri | |
| parent | 6401cc1f1fd50421ccb2ce90fdd84e3c519f3f72 (diff) | |
Fix building against 5.12 on most CIs
Change-Id: I4c4bbc75b9f6346a446f8094f669d142f76c164a
Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/configure.pri b/configure.pri index d3ba9b147..e4d04a898 100644 --- a/configure.pri +++ b/configure.pri @@ -461,10 +461,17 @@ defineTest(qtwebengine_isMacOsPlatformSupported) { defineTest(qtwebengine_isGCCVersionSupported) { # Keep in sync with src/webengine/doc/src/qtwebengine-platform-notes.qdoc - greaterThan(QMAKE_GCC_MAJOR_VERSION, 4):return(true) + lessThan(QMAKE_GCC_MAJOR_VERSION, 5) { + qtwebengine_platformError("requires at least gcc version 5, but using gcc version $${QMAKE_GCC_MAJOR_VERSION}.$${QMAKE_GCC_MINOR_VERSION}.") + return(false) + } - qtwebengine_platformError("requires at least gcc version 5, but using gcc version $${QMAKE_GCC_MAJOR_VERSION}.$${QMAKE_GCC_MINOR_VERSION}.") - return(false) + equals(QMAKE_GCC_MAJOR_VERSION, 5): equals(QMAKE_GCC_MINOR_VERSION, 4): equals(QMAKE_GCC_PATCH_VERSION, 0) { + qtwebengine_platformError("gcc version 5.4.0 is blacklisted due to internal compiler errors.") + return(false) + } + + return(true) } defineTest(qtwebengine_isBuildingOnWin32) { |