summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@theqtcompany.com>2015-01-19 14:14:50 +0100
committerMichael BrĂ¼ning <michael.bruning@theqtcompany.com>2015-01-19 16:08:00 +0100
commit91cc1c217bd370f27dc1f063f70dec3786a1f3bf (patch)
treedabace07fda4120bc050fe15043019bba391ba54 /tools
parentcd38504c03cd5c9efef381eeafafb32da38b817c (diff)
Make GCC 4.7 mandatory to build Qt WebEngine.
GCC 4.6 does not support all the C++11 features that we need. Change-Id: I41974b16c361ea1bb1934758bf2eb3b73d2df653 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/qmake/mkspecs/features/functions.prf6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index df7cf1300..83a3b30b4 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -30,10 +30,10 @@ defineTest(isPythonVersionSupported) {
}
defineTest(isGCCVersionSupported) {
- # The below will work for gcc 4.6 and up and also match gcc 5
- greaterThan(QT_GCC_MINOR_VERSION, 5):return(true)
+ # The below will work for gcc 4.7 and up and also match gcc 5
+ greaterThan(QT_GCC_MINOR_VERSION, 6):return(true)
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 4.6 is required to build Qt WebEngine.")
+ skipBuild("Using gcc version "$$QT_GCC_MAJOR_VERSION"."$$QT_GCC_MINOR_VERSION", but at least gcc version 4.7 is required to build Qt WebEngine.")
return(false)
}