diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2015-05-23 18:50:36 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-12-15 19:54:03 +0100 |
| commit | 7ba79f36317afc261f8d6d5f7185bddad05a22a7 (patch) | |
| tree | bc47d26bcd6193913f465233bbf43431318d25d7 | |
| parent | e2922dd2085a78f85ae8f71073cb0d1d5638c032 (diff) | |
| download | qt3-7ba79f36317afc261f8d6d5f7185bddad05a22a7.tar.gz qt3-7ba79f36317afc261f8d6d5f7185bddad05a22a7.zip | |
Update buildkey for GCC 5
[taken from RedHat Qt3 patches]
(cherry picked from commit 0d96f74958fd20bbafe4ba457d99a802abb12a58)
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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.*" ;; *) |