Blame SOURCES/qt-everywhere-opensource-src-4.8.7-gcc6.patch
|
 |
402b94 |
diff -up qt-everywhere-opensource-src-4.8.7/configure.gcc6 qt-everywhere-opensource-src-4.8.7/configure
|
|
|
402b94 |
--- qt-everywhere-opensource-src-4.8.7/configure.gcc6 2016-04-15 07:04:19.430268222 -0500
|
|
|
402b94 |
+++ qt-everywhere-opensource-src-4.8.7/configure 2016-04-15 07:05:22.157568689 -0500
|
|
|
402b94 |
@@ -7744,7 +7744,7 @@ case "$XPLATFORM" in
|
|
|
402b94 |
*-g++*)
|
|
|
402b94 |
# Check gcc's version
|
|
|
402b94 |
case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
|
|
|
402b94 |
- 5*|4*|3.4*)
|
|
|
402b94 |
+ 8*|7*|6*|5*|4*|3.4*)
|
|
|
402b94 |
;;
|
|
|
402b94 |
3.3*)
|
|
|
402b94 |
canBuildWebKit="no"
|
|
|
402b94 |
@@ -8060,7 +8060,7 @@ g++*)
|
|
|
402b94 |
3.*)
|
|
|
402b94 |
COMPILER_VERSION="3.*"
|
|
|
402b94 |
;;
|
|
|
402b94 |
- 5*|4.*)
|
|
|
402b94 |
+ 8*|7*|6*|5*|4.*)
|
|
|
402b94 |
COMPILER_VERSION="4"
|
|
|
402b94 |
;;
|
|
|
402b94 |
*)
|
|
|
402b94 |
diff -up qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6 qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h
|
|
|
402b94 |
--- qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6 2015-05-07 09:14:48.000000000 -0500
|
|
|
402b94 |
+++ qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h 2016-04-15 07:04:19.431268227 -0500
|
|
|
402b94 |
@@ -70,8 +70,8 @@ namespace QPatternist
|
|
|
402b94 |
ForegroundShift = 10,
|
|
|
402b94 |
BackgroundShift = 20,
|
|
|
402b94 |
SpecialShift = 20,
|
|
|
402b94 |
- ForegroundMask = ((1 << ForegroundShift) - 1) << ForegroundShift,
|
|
|
402b94 |
- BackgroundMask = ((1 << BackgroundShift) - 1) << BackgroundShift
|
|
|
402b94 |
+ ForegroundMask = 0x1f << ForegroundShift,
|
|
|
402b94 |
+ BackgroundMask = 0x7 << BackgroundShift
|
|
|
402b94 |
};
|
|
|
402b94 |
|
|
|
402b94 |
public:
|