diff options
| author | Holger Freyther <zecke@selfish.org> | 2007-12-23 22:35:09 +0000 |
|---|---|---|
| committer | Holger Freyther <zecke@selfish.org> | 2007-12-23 22:35:09 +0000 |
| commit | d5133e67e43c7022e7c6f4c2ad4d9d784153758b (patch) | |
| tree | 6058f480d4865f529bedd3667f8bb11bcd0260d3 /packages/qt4/qt4-x11-free-4.1.2/gcc4_1.patch | |
| parent | ca4bb462deb3b86c87b0f81ad097620ccfd199f7 (diff) | |
Move Qt/X11 and Qt/Embedded (known as QtopiaCore) to a qt4 directory. We will see a great unification in this directory.
Besides the name Qt/X11 and Qt/Emebedded (QtopiaCore) are the same package
with a different configure script. The aim is to share configuring, compiling,
staging and packaging between these modules and making it more easy to try a bleeding
qt snapshot.
Diffstat (limited to 'packages/qt4/qt4-x11-free-4.1.2/gcc4_1.patch')
| -rw-r--r-- | packages/qt4/qt4-x11-free-4.1.2/gcc4_1.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/packages/qt4/qt4-x11-free-4.1.2/gcc4_1.patch b/packages/qt4/qt4-x11-free-4.1.2/gcc4_1.patch new file mode 100644 index 0000000000..392aaf4f5f --- /dev/null +++ b/packages/qt4/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 |