You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
36 lines
1.5 KiB
36 lines
1.5 KiB
5 years ago
|
diff -up qt-everywhere-opensource-src-4.8.7/configure.gcc6 qt-everywhere-opensource-src-4.8.7/configure
|
||
|
|
--- qt-everywhere-opensource-src-4.8.7/configure.gcc6 2016-04-15 07:04:19.430268222 -0500
|
||
|
|
+++ qt-everywhere-opensource-src-4.8.7/configure 2016-04-15 07:05:22.157568689 -0500
|
||
|
|
@@ -7744,7 +7744,7 @@ case "$XPLATFORM" in
|
||
|
|
*-g++*)
|
||
|
|
# Check gcc's version
|
||
|
|
case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
|
||
|
|
- 5*|4*|3.4*)
|
||
|
|
+ 8*|7*|6*|5*|4*|3.4*)
|
||
|
|
;;
|
||
|
|
3.3*)
|
||
|
|
canBuildWebKit="no"
|
||
|
|
@@ -8060,7 +8060,7 @@ g++*)
|
||
|
|
3.*)
|
||
|
|
COMPILER_VERSION="3.*"
|
||
|
|
;;
|
||
|
|
- 5*|4.*)
|
||
|
|
+ 8*|7*|6*|5*|4.*)
|
||
|
|
COMPILER_VERSION="4"
|
||
|
|
;;
|
||
|
|
*)
|
||
|
|
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
|
||
|
|
--- qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6 2015-05-07 09:14:48.000000000 -0500
|
||
|
|
+++ qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h 2016-04-15 07:04:19.431268227 -0500
|
||
|
|
@@ -70,8 +70,8 @@ namespace QPatternist
|
||
|
|
ForegroundShift = 10,
|
||
|
|
BackgroundShift = 20,
|
||
|
|
SpecialShift = 20,
|
||
|
|
- ForegroundMask = ((1 << ForegroundShift) - 1) << ForegroundShift,
|
||
|
|
- BackgroundMask = ((1 << BackgroundShift) - 1) << BackgroundShift
|
||
|
|
+ ForegroundMask = 0x1f << ForegroundShift,
|
||
|
|
+ BackgroundMask = 0x7 << BackgroundShift
|
||
|
|
};
|
||
|
|
|
||
|
|
public:
|