From 7ba79f36317afc261f8d6d5f7185bddad05a22a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sat, 23 May 2015 18:50:36 +0200
Subject: Update buildkey for GCC 5 [taken from RedHat Qt3 patches] (cherry
 picked from commit 0d96f74958fd20bbafe4ba457d99a802abb12a58)

---
 configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index b81489c..7a0dea2 100755
--- a/configure
+++ b/configure
@@ -2789,7 +2789,7 @@ case "$COMPILER" in
 g++*)
     # GNU C++
     QMAKE_CONF_COMPILER=`grep "QMAKE_CXX[^_A-Z0-9a-z]" $QMAKESPEC/qmake.conf | sed "s,.* *= *\(.*\)$,\1,"`
-    COMPILER_VERSION=`${QMAKE_CONF_COMPILER} --version 2>/dev/null | sed 's,^[^0-9]*,,g'`
+    COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -dumpversion 2>/dev/null | sed 's,^[^0-9]*,,g'`
     case "$COMPILER_VERSION" in
     2.95.*)
 	COMPILER_VERSION="2.95.*"
@@ -2797,7 +2797,7 @@ g++*)
     3.*)
 	COMPILER_VERSION="3.*"
 	;;
-    4.*)
+    5.*|4.*)
 	COMPILER_VERSION="4.*"
 	;;
     *)
-- 
cgit v1.2.1