| author | mickeyl <mickeyl> | 2004-04-27 19:17:46 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2004-04-27 19:17:46 (UTC) |
| commit | 8ce67859c54234dabd88e17a0bc72369ea8301a3 (patch) (unidiff) | |
| tree | 15314fee06d979233e63e7246366b0b939a21207 | |
| parent | 7e3f65c9733254bf9f67932cc4f3833fba9a4914 (diff) | |
| download | opie-8ce67859c54234dabd88e17a0bc72369ea8301a3.zip opie-8ce67859c54234dabd88e17a0bc72369ea8301a3.tar.gz opie-8ce67859c54234dabd88e17a0bc72369ea8301a3.tar.bz2 | |
fix Qt/Embedded's STL breakage w/ g++ 3.4
| -rw-r--r-- | qt/qt-2.3.7.patch/qte237-all.patch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/qt/qt-2.3.7.patch/qte237-all.patch b/qt/qt-2.3.7.patch/qte237-all.patch index 43d7a69..daf0e9c 100644 --- a/qt/qt-2.3.7.patch/qte237-all.patch +++ b/qt/qt-2.3.7.patch/qte237-all.patch | |||
| @@ -809,6 +809,17 @@ | |||
| 809 | #endif | 809 | #endif |
| 810 | -} Q_PACKED; | 810 | -} Q_PACKED; |
| 811 | +}; // was: Q_PACKED; (arm-linux-)g++ 3.4 no longer allows direct access to packed structures. ML. | 811 | +}; // was: Q_PACKED; (arm-linux-)g++ 3.4 no longer allows direct access to packed structures. ML. |
| 812 | 812 | ||
| 813 | inline QChar::QChar() | 813 | inline QChar::QChar() |
| 814 | { | 814 | { |
| 815 | --- 2.3.7/src/tools/qcstring.h~gcc34-compliance2004-04-27 20:21:48.000000000 +0200 | ||
| 816 | +++ 2.3.7/src/tools/qcstring.h2004-04-27 20:22:52.000000000 +0200 | ||
| 817 | @@ -119,7 +119,7 @@ | ||
| 818 | // We want to keep source compatibility for 2.x | ||
| 819 | // ### TODO for 4.0: completely remove these and the cstr* functions | ||
| 820 | |||
| 821 | -#if !defined(QT_GENUINE_STR) | ||
| 822 | +#if 0 | ||
| 823 | |||
| 824 | #undefstrlen | ||
| 825 | #define strlen qstrlen | ||