diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2011-09-15 12:29:08 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-15 16:36:34 +0200 |
| commit | 80d406ce39d23ec6c859b9aa427dee8d0d3c9d50 (patch) | |
| tree | 6bc4b618194c902994ea6496f4567ab22b4976ff | |
| parent | 060f0f9d2dba4f5ef8f3975dba7914ee0f2b6d83 (diff) | |
Re-add QT_GCC_*_VERSION qmake variables
Commit 7493ee1c44a16dc3b155a5bf3ed7ca966a71072a accidentally removed them.
Change-Id: Ia5132b374ded047ae19479bc98d8564f527e5be2
Reviewed-on: http://codereview.qt-project.org/4970
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rwxr-xr-x | configure | 24 |
1 files changed, 24 insertions, 0 deletions
@@ -7696,6 +7696,30 @@ if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] ; then fi fi +case "$COMPILER" in +g++*) + # GNU C++ + COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -dumpversion 2>/dev/null` + + case "$COMPILER_VERSION" in + *.*.*) + QT_GCC_MAJOR_VERSION=`echo $COMPILER_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*,\1,'` + QT_GCC_MINOR_VERSION=`echo $COMPILER_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*,\2,'` + QT_GCC_PATCH_VERSION=`echo $COMPILER_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*,\3,'` + ;; + *.*) + QT_GCC_MAJOR_VERSION=`echo $COMPILER_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\).*,\1,'` + QT_GCC_MINOR_VERSION=`echo $COMPILER_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\).*,\2,'` + QT_GCC_PATCH_VERSION=0 + ;; + esac + + ;; +*) + # + ;; +esac + #------------------------------------------------------------------------------- # part of configuration information goes into qconfig.h #------------------------------------------------------------------------------- |