summaryrefslogtreecommitdiff
path: root/packages/qt/qt4-x11-free-4.1.2/gcc4_1.patch
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-05-03 16:53:49 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-05-03 16:53:49 +0000
commit261577deb860dbddd904acba4827129dfe6eb782 (patch)
tree714cee36cda8bd5df45676ca3d4b7b0781e65e58 /packages/qt/qt4-x11-free-4.1.2/gcc4_1.patch
parent914ca8cc9334fde6c2eb0c6e356840f5cc3944f0 (diff)
add qt4-x11 4.1.2
Diffstat (limited to 'packages/qt/qt4-x11-free-4.1.2/gcc4_1.patch')
-rw-r--r--packages/qt/qt4-x11-free-4.1.2/gcc4_1.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/packages/qt/qt4-x11-free-4.1.2/gcc4_1.patch b/packages/qt/qt4-x11-free-4.1.2/gcc4_1.patch
new file mode 100644
index 0000000000..392aaf4f5f
--- /dev/null
+++ b/packages/qt/qt4-x11-free-4.1.2/gcc4_1.patch
@@ -0,0 +1,50 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- qt-x11-opensource-src-4.1.1/src/corelib/tools/qchar.h~gcc4_1.patch
++++ qt-x11-opensource-src-4.1.1/src/corelib/tools/qchar.h
+@@ -219,7 +219,7 @@
+ inline const char toLatin1() const;
+ inline const ushort unicode() const { return ucs; }
+ #ifdef Q_NO_PACKED_REFERENCE
+- inline ushort &unicode() { return *(&ucs); }
++ inline ushort &unicode() { return *((ushort*)&ucs); }
+ #else
+ inline ushort &unicode() { return ucs; }
+ #endif
+--- qt-x11-opensource-src-4.1.1/src/gui/kernel/qapplication_x11.cpp~gcc4_1.patch
++++ qt-x11-opensource-src-4.1.1/src/gui/kernel/qapplication_x11.cpp
+@@ -1193,6 +1193,18 @@
+ }
+ }
+
++static void getXDefault(const char *group, const char *key, float *val)
++{
++ char *str = XGetDefault(X11->display, group, key);
++ if (str) {
++ char *end = 0;
++ float v = strtod(str, &end);
++ if (str != end)
++ *val = v;
++ }
++}
++
++
+ static void getXDefault(const char *group, const char *key, bool *val)
+ {
+ char *str = XGetDefault(X11->display, group, key);
+--- qt-x11-opensource-src-4.1.1/src/corelib/global/qglobal.h~gcc4_1.patch
++++ qt-x11-opensource-src-4.1.1/src/corelib/global/qglobal.h
+@@ -720,8 +720,8 @@
+
+ #if defined(QT_COORD_TYPE)
+ typedef QT_COORD_TYPE qreal;
+-#elif defined(__arm__)
+-typedef float qreal;
++//#elif defined(__arm__)
++//typedef float qreal;
+ #else
+ typedef double qreal;
+ #endif