27 lines
1.3 KiB
Diff
27 lines
1.3 KiB
Diff
diff -up qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.than 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.than 2016-02-03 11:43:04.567757448 +0100
|
|
+++ qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h 2016-02-04 13:12:26.394350271 +0100
|
|
@@ -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:
|
|
diff -up qt-everywhere-opensource-src-4.8.7/configure.than qt-everywhere-opensource-src-4.8.7/configure
|
|
--- qt-everywhere-opensource-src-4.8.7/configure.than 2016-02-10 16:19:31.763130618 +0100
|
|
+++ qt-everywhere-opensource-src-4.8.7/configure 2016-02-10 16:19:48.508500789 +0100
|
|
@@ -7741,7 +7741,7 @@ case "$XPLATFORM" in
|
|
*-g++*)
|
|
# Check gcc's version
|
|
case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
|
|
- 5*|4*|3.4*)
|
|
+ 6*|5*|4*|3.4*)
|
|
;;
|
|
3.3*)
|
|
canBuildWebKit="no"
|