summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-05-23 16:50:39 (GMT)
committer Slávek Banko <slavek.banko@axis.cz>2015-05-23 16:50:39 (GMT)
commitfa440833f9a7fc999cb82c02911f61c8134c10af (patch)
treed6cff8af422f9359228ea3d94e0b51d899c684ab
parent094708c0e7379cbc825488cd6101c6b8a610302a (diff)
downloadtqt3-fa440833.zip
tqt3-fa440833.tar.gz
Update buildkey for GCC 5
[taken from RedHat Qt3 patches]
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 816e1a3..a131dcd 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.*"
;;
*)