Skip to content

Commit 4badb86

Browse files
rdieterperezmeyer
authored andcommitted
Configure: Fix detection of GCC 5
- Backport qt5 commit 9fb4c2c412621b63c06dbbd899f44041b2e126c2 - fix webkit feature enablement - set QT_BUILD_KEY (same as gcc4), Qt5 has no QT_BUILD_KEY so no change there is necessary Change-Id: Ie131be711a774052bc42f18e8090b2a3dde69475 Reviewed-by: Thiago Macieira <[email protected]> Reviewed-by: Dmitry Shachnev <[email protected]> Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <[email protected]>
1 parent 08c0f9c commit 4badb86

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

configure

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7729,7 +7729,7 @@ case "$XPLATFORM" in
77297729
*-g++*)
77307730
# Check gcc's version
77317731
case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
7732-
4*|3.4*)
7732+
5*|4*|3.4*)
77337733
;;
77347734
3.3*)
77357735
canBuildWebKit="no"
@@ -8031,6 +8031,11 @@ g++*)
80318031
QT_GCC_MINOR_VERSION=`echo $COMPILER_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\).*,\2,'`
80328032
QT_GCC_PATCH_VERSION=0
80338033
;;
8034+
*)
8035+
QT_GCC_MAJOR_VERSION=$COMPILER_VERSION
8036+
QT_GCC_MINOR_VERSION=0
8037+
QT_GCC_PATCH_VERSION=0
8038+
;;
80348039
esac
80358040

80368041
case "$COMPILER_VERSION" in
@@ -8040,7 +8045,7 @@ g++*)
80408045
3.*)
80418046
COMPILER_VERSION="3.*"
80428047
;;
8043-
4.*)
8048+
5*|4.*)
80448049
COMPILER_VERSION="4"
80458050
;;
80468051
*)

0 commit comments

Comments
 (0)