Merge branch 'master' into f21
This commit is contained in:
commit
7f333dc409
|
@ -0,0 +1,38 @@
|
||||||
|
From 404f4281fda764cafdaa5635db995dabc4f1de8c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Dmitry Shachnev <mitya57@gmail.com>
|
||||||
|
Date: Tue, 9 Dec 2014 09:27:53 +0300
|
||||||
|
Subject: [PATCH 173/179] qimage_conversions.cpp: Fix build on big endian
|
||||||
|
systems
|
||||||
|
|
||||||
|
Change-Id: I8149eb2deaa101daf85a957ff48c3a7140c43bbc
|
||||||
|
Reviewed-by: Timo Jyrinki <timo.jyrinki@canonical.com>
|
||||||
|
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
|
||||||
|
---
|
||||||
|
src/gui/image/qimage_conversions.cpp | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/gui/image/qimage_conversions.cpp b/src/gui/image/qimage_conversions.cpp
|
||||||
|
index 17563b1..858a0d9 100644
|
||||||
|
--- a/src/gui/image/qimage_conversions.cpp
|
||||||
|
+++ b/src/gui/image/qimage_conversions.cpp
|
||||||
|
@@ -2252,7 +2252,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
|
||||||
|
convert_ARGB_to_ARGB_PM,
|
||||||
|
#else
|
||||||
|
0,
|
||||||
|
- 0
|
||||||
|
+ 0,
|
||||||
|
#endif
|
||||||
|
0, 0, 0, 0
|
||||||
|
}, // Format_RGBA8888
|
||||||
|
@@ -2281,7 +2281,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
|
||||||
|
#else
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
- 0
|
||||||
|
+ 0,
|
||||||
|
#endif
|
||||||
|
0, 0, 0, 0
|
||||||
|
}, // Format_RGBA8888_Premultiplied
|
||||||
|
--
|
||||||
|
1.9.3
|
||||||
|
|
|
@ -84,6 +84,7 @@ Patch50: qt5-poll.patch
|
||||||
# tweak font gamma correction, from:
|
# tweak font gamma correction, from:
|
||||||
# https://bugreports.qt-project.org/browse/QTBUG-41590
|
# https://bugreports.qt-project.org/browse/QTBUG-41590
|
||||||
Patch109: 0009-Do-not-apply-subpixel-gamma-correction-on-XCB.patch
|
Patch109: 0009-Do-not-apply-subpixel-gamma-correction-on-XCB.patch
|
||||||
|
Patch273: 0173-qimage_conversions.cpp-Fix-build-on-big-endian-syste.patch
|
||||||
|
|
||||||
# macros, be mindful to keep sync'd with macros.qt5
|
# macros, be mindful to keep sync'd with macros.qt5
|
||||||
Source1: macros.qt5
|
Source1: macros.qt5
|
||||||
|
@ -317,6 +318,7 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
|
||||||
#patch50 -p1 -b .poll
|
#patch50 -p1 -b .poll
|
||||||
|
|
||||||
%patch109 -p1 -b .0009
|
%patch109 -p1 -b .0009
|
||||||
|
%patch273 -p1 -b .0173
|
||||||
|
|
||||||
# drop -fexceptions from $RPM_OPT_FLAGS
|
# drop -fexceptions from $RPM_OPT_FLAGS
|
||||||
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
|
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
|
||||||
|
|
Loading…
Reference in New Issue