diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-12-11 10:55:18 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-12-11 15:52:24 +0100 |
| commit | 91696b2cb090e5b6147a30465f74d8d37db48615 (patch) | |
| tree | e73d4adee4f9f2040e8986b8388737d3bf866a5d /configure.pri | |
| parent | 1b79f9ccffe468107be5f6c5d3ad42cdcfdef585 (diff) | |
| parent | dad48eb41d1b4b4b32c73884a1c29dd6d9408c33 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Id1a1f4ca84697ba18e2604090e3154295fe1858b
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 b592220a7..2d42613c0 100644 --- a/configure.pri +++ b/configure.pri @@ -467,10 +467,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) { |