From 36b11bb908c1e3de51601d2c93059b96e41c4f82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 23 May 2015 18:50:39 +0200 Subject: [PATCH] Update buildkey for GCC 5 [taken from RedHat Qt3 patches] (cherry picked from commit fa440833f9a7fc999cb82c02911f61c8134c10af) --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 6e31bfc3..f22cbf97 100755 --- a/configure +++ b/configure @@ -2810,7 +2810,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.*" @@ -2818,7 +2818,7 @@ g++*) 3.*) COMPILER_VERSION="3.*" ;; - 4.*) + 5.*|4.*) COMPILER_VERSION="4.*" ;; *)