blob: 85b918525096d671b4bfa9f50f7cdd6988a81c2e (
plain)
1 diff -up qt-everywhere-opensource-src-4.8.7/configure.gcc6 qt-everywhere-opensource-src-4.8.7/configure
2 --- qt-everywhere-opensource-src-4.8.7/configure.gcc6 2016-04-15 07:04:19.430268222 -0500
3 +++ qt-everywhere-opensource-src-4.8.7/configure 2016-04-15 07:05:22.157568689 -0500
4 @@ -7744,7 +7744,7 @@ case "$XPLATFORM" in
5 *-g++*)
6 # Check gcc's version
7 case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
8 - 5*|4*|3.4*)
9 + 8*|7*|6*|5*|4*|3.4*)
10 ;;
11 3.3*)
12 canBuildWebKit="no"
13 @@ -8060,7 +8060,7 @@ g++*)
14 3.*)
15 COMPILER_VERSION="3.*"
16 ;;
17 - 5*|4.*)
18 + 8*|7*|6*|5*|4.*)
19 COMPILER_VERSION="4"
20 ;;
21 *)
22 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
23 --- qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6 2015-05-07 09:14:48.000000000 -0500
24 +++ qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h 2016-04-15 07:04:19.431268227 -0500
25 @@ -70,8 +70,8 @@ namespace QPatternist
26 ForegroundShift = 10,
27 BackgroundShift = 20,
28 SpecialShift = 20,
29 - ForegroundMask = ((1 << ForegroundShift) - 1) << ForegroundShift,
30 - BackgroundMask = ((1 << BackgroundShift) - 1) << BackgroundShift
31 + ForegroundMask = 0x1f << ForegroundShift,
32 + BackgroundMask = 0x7 << BackgroundShift
33 };
34
35 public:
|
