diff options
| author | Rex Dieter <rdieter@gmail.com> | 2015-02-18 07:17:22 -0600 |
|---|---|---|
| committer | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2015-03-09 16:14:41 +0000 |
| commit | 4badb867bbffbd66762c150258b37b6c0b7e3c22 (patch) | |
| tree | 6827fdf6b1d5d3ec43532c73479bf6bc5c97a02f | |
| parent | 08c0f9cf858e7c2563c8b6c3b121d619989a92ee (diff) | |
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 <thiago.macieira@intel.com>
Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
| -rwxr-xr-x | configure | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -7729,7 +7729,7 @@ case "$XPLATFORM" in *-g++*) # Check gcc's version case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in - 4*|3.4*) + 5*|4*|3.4*) ;; 3.3*) canBuildWebKit="no" @@ -8031,6 +8031,11 @@ g++*) QT_GCC_MINOR_VERSION=`echo $COMPILER_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\).*,\2,'` QT_GCC_PATCH_VERSION=0 ;; + *) + QT_GCC_MAJOR_VERSION=$COMPILER_VERSION + QT_GCC_MINOR_VERSION=0 + QT_GCC_PATCH_VERSION=0 + ;; esac case "$COMPILER_VERSION" in @@ -8040,7 +8045,7 @@ g++*) 3.*) COMPILER_VERSION="3.*" ;; - 4.*) + 5*|4.*) COMPILER_VERSION="4" ;; *) |