summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-05-23 18:50:36 +0200
committerSlávek Banko <slavek.banko@axis.cz>2015-05-23 18:53:14 +0200
commit6b9213a69c5a16e193f014c9b78d846cae716566 (patch)
treea1be80add8866025104edb2b57215945d5246e55
parentd3f640f17ccc031e7e547285b0d9e696a31919a9 (diff)
downloadqt3-6b9213a69c5a16e193f014c9b78d846cae716566.tar.gz
qt3-6b9213a69c5a16e193f014c9b78d846cae716566.zip
Update buildkey for GCC 5r14.0.1
[taken from RedHat Qt3 patches] (cherry picked from commit 0d96f74958fd20bbafe4ba457d99a802abb12a58)
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 6032cc7..2356cdd 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.*"
;;
*)