diff options
| author | Slávek Banko <[email protected]> | 2015-05-23 18:50:39 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2015-05-23 18:54:10 +0200 |
| commit | 36b11bb908c1e3de51601d2c93059b96e41c4f82 (patch) | |
| tree | be946e9d505cef808775243f33c83a8e19e98f22 | |
| parent | d07bc24c915c0830ed41907d8ebfe53281fd210e (diff) | |
| download | tqt3-36b11bb908c1e3de51601d2c93059b96e41c4f82.tar.gz tqt3-36b11bb908c1e3de51601d2c93059b96e41c4f82.zip | |
Update buildkey for GCC 5
[taken from RedHat Qt3 patches]
(cherry picked from commit fa440833f9a7fc999cb82c02911f61c8134c10af)
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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.*" ;; *) |