fix Qt/Embedded's STL breakage w/ g++ 3.4

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
@@ -791,24 +791,35 @@
 +    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-all2003-07-17 03:20:26.000000000 +0200
         +++ qt-2.3.7/src/tools/qstring.h2004-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-compliance2004-04-27 20:21:48.000000000 +0200
+        +++ 2.3.7/src/tools/qcstring.h2004-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
+ 
+         #undefstrlen
+ #define strlen qstrlen