summaryrefslogtreecommitdiffstats
path: root/meta-qt3/recipes-qt3/qt3/qt-x11-free/gcc4_1-HACK.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-qt3/recipes-qt3/qt3/qt-x11-free/gcc4_1-HACK.patch')
-rw-r--r--meta-qt3/recipes-qt3/qt3/qt-x11-free/gcc4_1-HACK.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/meta-qt3/recipes-qt3/qt3/qt-x11-free/gcc4_1-HACK.patch b/meta-qt3/recipes-qt3/qt3/qt-x11-free/gcc4_1-HACK.patch
new file mode 100644
index 0000000..818bced
--- /dev/null
+++ b/meta-qt3/recipes-qt3/qt3/qt-x11-free/gcc4_1-HACK.patch
@@ -0,0 +1,28 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- qt-x11-free-3.3.6/src/tools/qstring.h~gcc4_1.patch
7+++ qt-x11-free-3.3.6/src/tools/qstring.h
8@@ -60,7 +60,7 @@
9 #endif
10 #endif
11
12-
13+#define Q_NO_PACKED_REFERENCE
14 /*****************************************************************************
15 QString class
16 *****************************************************************************/
17@@ -194,9 +194,9 @@
18 char latin1() const { return ucs > 0xff ? 0 : (char) ucs; }
19 ushort unicode() const { return ucs; }
20 #ifdef Q_NO_PACKED_REFERENCE
21- ushort &unicode() { return *(&ucs); }
22+ ushort &unicode() { return *((ushort*)&ucs); }
23 #else
24- ushort &unicode() { return ucs; }
25+ ushort &unicode() { return (ushort)ucs; }
26 #endif
27 #ifndef QT_NO_CAST_ASCII
28 // like all ifdef'd code this is undocumented