diff options
author | Jüri Valdmann <juri.valdmann@qt.io> | 2018-07-20 10:22:12 +0200 |
---|---|---|
committer | Jüri Valdmann <juri.valdmann@qt.io> | 2018-07-23 08:01:54 +0000 |
commit | 38952ec359423a060d9e2f500f2d9eba2336f532 (patch) | |
tree | daa54e5b88c7aeae89692891f8f14babbf7bebf7 | |
parent | 10376cbe5d653f1fd1a5554e00d288eaf3e94a78 (diff) |
Fix minimum GCC version in documentation
The documentation says we require 4.7 or later but actually already since the
5.10.0 release our qmake config has been checking for version 5 or later.
Task-number: QTBUG-69535
Change-Id: Ia2f74b35570a9ba6fd1423b9507fe636d850db76
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
-rw-r--r-- | mkspecs/features/platform.prf | 1 | ||||
-rw-r--r-- | src/webengine/doc/src/qtwebengine-platform-notes.qdoc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf index 2c8ef43a5..614f7fc92 100644 --- a/mkspecs/features/platform.prf +++ b/mkspecs/features/platform.prf @@ -88,6 +88,7 @@ defineTest(isArchSupported) { } defineTest(isGCCVersionSupported) { + # Keep in sync with src/webengine/doc/src/qtwebengine-platform-notes.qdoc greaterThan(QT_GCC_MAJOR_VERSION, 4):return(true) skipBuild("Using gcc version "$$QT_GCC_MAJOR_VERSION"."$$QT_GCC_MINOR_VERSION", but at least gcc version 5 is required to build Qt WebEngine.") diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc index 5d7c70560..f72a3e5be 100644 --- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc +++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc @@ -73,7 +73,7 @@ \section2 Linux - On Linux, Clang or GCC version 4.7 or later is required. + On Linux, Clang or GCC version 5 or later is required. Supported configurations are \c linux-g++ and \c{linux-clang}. Qt WebEngine requires \c pkg-config to detect most of its dependencies. The |