25 lines
884 B
Diff
25 lines
884 B
Diff
diff -up qt-everywhere-opensource-src-4.8.6/configure.fix_detection_of_gcc5 qt-everywhere-opensource-src-4.8.6/configure
|
|
--- qt-everywhere-opensource-src-4.8.6/configure.fix_detection_of_gcc5 2014-04-10 13:37:08.000000000 -0500
|
|
+++ qt-everywhere-opensource-src-4.8.6/configure 2015-02-16 08:36:16.363785377 -0600
|
|
@@ -7729,7 +7729,7 @@ case "$XPLATFORM" in
|
|
*-g++*)
|
|
# Check gcc's version
|
|
case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
|
|
- 4*|3.4*)
|
|
+ 5*|4*|3.4*)
|
|
;;
|
|
3.3*)
|
|
canBuildWebKit="no"
|
|
@@ -8031,6 +8031,11 @@ g++*)
|
|
QT_GCC_MINOR_VERSION=`echo $COMPILER_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\).*,\2,'`
|
|
QT_GCC_PATCH_VERSION=0
|
|
;;
|
|
+ *)
|
|
+ QT_GCC_MAJOR_VERSION=$COMPILER_VERSION
|
|
+ QT_GCC_MINOR_VERSION=0
|
|
+ QT_GCC_PATCH_VERSION=0
|
|
+ ;;
|
|
esac
|
|
|
|
case "$COMPILER_VERSION" in
|