diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2006-03-30 14:11:45 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-03-30 14:11:45 +0000 |
| commit | 689e31831953d5e817525447664c915f0b1377e1 (patch) | |
| tree | f72af26dc35c4a6817e797ff349dc2112d9d849c /packages/qt/qt-x11-free | |
| parent | 2b0add3a1a9cf83dd00b8bde2db75bc9c17d7ca9 (diff) | |
qt-x11-free: upgrade to 3.3.6 and 4.1.1 respectively
Diffstat (limited to 'packages/qt/qt-x11-free')
| -rw-r--r-- | packages/qt/qt-x11-free/gcc4_1-HACK.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/packages/qt/qt-x11-free/gcc4_1-HACK.patch b/packages/qt/qt-x11-free/gcc4_1-HACK.patch new file mode 100644 index 0000000000..818bced4ee --- /dev/null +++ b/packages/qt/qt-x11-free/gcc4_1-HACK.patch @@ -0,0 +1,28 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-free-3.3.6/src/tools/qstring.h~gcc4_1.patch ++++ qt-x11-free-3.3.6/src/tools/qstring.h +@@ -60,7 +60,7 @@ + #endif + #endif + +- ++#define Q_NO_PACKED_REFERENCE + /***************************************************************************** + QString class + *****************************************************************************/ +@@ -194,9 +194,9 @@ + char latin1() const { return ucs > 0xff ? 0 : (char) ucs; } + ushort unicode() const { return ucs; } + #ifdef Q_NO_PACKED_REFERENCE +- ushort &unicode() { return *(&ucs); } ++ ushort &unicode() { return *((ushort*)&ucs); } + #else +- ushort &unicode() { return ucs; } ++ ushort &unicode() { return (ushort)ucs; } + #endif + #ifndef QT_NO_CAST_ASCII + // like all ifdef'd code this is undocumented |