Re-add QT_GCC_*_VERSION qmake variables
authorSimon Hausmann <simon.hausmann@nokia.com>
Thu, 15 Sep 2011 10:29:08 +0000 (12:29 +0200)
committerQt by Nokia <qt-info@nokia.com>
Thu, 15 Sep 2011 14:36:34 +0000 (16:36 +0200)
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>
configure

index d35c689..4477d2c 100755 (executable)
--- a/configure
+++ b/configure
@@ -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
 #-------------------------------------------------------------------------------