summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-04-27 19:17:46 (UTC)
committer mickeyl <mickeyl>2004-04-27 19:17:46 (UTC)
commit8ce67859c54234dabd88e17a0bc72369ea8301a3 (patch) (side-by-side diff)
tree15314fee06d979233e63e7246366b0b939a21207
parent7e3f65c9733254bf9f67932cc4f3833fba9a4914 (diff)
downloadopie-8ce67859c54234dabd88e17a0bc72369ea8301a3.zip
opie-8ce67859c54234dabd88e17a0bc72369ea8301a3.tar.gz
opie-8ce67859c54234dabd88e17a0bc72369ea8301a3.tar.bz2
fix Qt/Embedded's STL breakage w/ g++ 3.4
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--qt/qt-2.3.7.patch/qte237-all.patch11
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
@@ -767,48 +767,59 @@
- brx = srcheight - brushoffs.y() - h;
- bry = brushoffs.x();
+ brx = this->srcheight - this->brushoffs.y() - h;
+ bry = this->brushoffs.x();
break;
default:
- brx = brushoffs.x();
- bry = brushoffs.y();
+ brx = this->brushoffs.x();
+ bry = this->brushoffs.y();
break;
}
- brushoffs = QPoint( brx, bry );
+ this->brushoffs = QPoint( brx, bry );
- int oldsw = srcwidth;
- int oldsh = srcheight;
- QSize s = qt_screen->mapToDevice( QSize(srcwidth,srcheight) );
- srcwidth = s.width();
- srcheight = s.height();
+ int oldsw = this->srcwidth;
+ int oldsh = this->srcheight;
+ QSize s = qt_screen->mapToDevice( QSize(this->srcwidth,this->srcheight) );
+ this->srcwidth = s.width();
+ this->srcheight = s.height();
QT_TRANS_GFX_BASE<depth,type>::tiledBlt( r.x(), r.y(), r.width(), r.height() );
- srcwidth = oldsw;
- srcheight = oldsh;
- brushoffs = oldBrushOffs;
+ this->srcwidth = oldsw;
+ this->srcheight = oldsh;
+ this->brushoffs = oldBrushOffs;
inDraw = FALSE;
}
--- qt-2.3.7/src/tools/qstring.h~qte237-all 2003-07-17 03:20:26.000000000 +0200
+++ qt-2.3.7/src/tools/qstring.h 2004-04-27 18:18:37.000000000 +0200
@@ -199,7 +199,7 @@
#endif
enum { net_ordered = 0 };
#endif
-} Q_PACKED;
+}; // was: Q_PACKED; (arm-linux-)g++ 3.4 no longer allows direct access to packed structures. ML.
inline QChar::QChar()
{
+--- 2.3.7/src/tools/qcstring.h~gcc34-compliance 2004-04-27 20:21:48.000000000 +0200
++++ 2.3.7/src/tools/qcstring.h 2004-04-27 20:22:52.000000000 +0200
+@@ -119,7 +119,7 @@
+ // We want to keep source compatibility for 2.x
+ // ### TODO for 4.0: completely remove these and the cstr* functions
+
+-#if !defined(QT_GENUINE_STR)
++#if 0
+
+ #undef strlen
+ #define strlen qstrlen