Merge commit 'origin/master'

Conflicts:
	src/corelib/global/qglobal.h
	src/corelib/kernel/qmetatype.cpp
	src/corelib/kernel/qobject.cpp
	src/corelib/thread/qthread_unix.cpp
	src/gui/graphicsview/qgraphicssceneevent.h
	src/gui/itemviews/qheaderview.h
	src/gui/kernel/qapplication_qws.cpp
	src/gui/kernel/qgesture.h
	src/gui/kernel/qgesturerecognizer.h
	src/gui/painting/qpaintengine_raster.cpp
	src/network/access/qhttpnetworkreply.cpp
	src/network/access/qnetworkcookie.h
	src/network/socket/qnativesocketengine_unix.cpp

1 files changed, 7 insertions, 7 deletions

diff --git a/src/gui/kernel/qdnd_s60.cpp b/src/gui/kernel/qdnd_s60.cpp
index c459f8f..c7656b0 100644
--- a/src/gui/kernel/qdnd_s60.cpp
+++ b/src/gui/kernel/qdnd_s60.cpp
@@ -94,8 +94,8 @@ class QShapedPixmapWidget
 public:
     QShapedPixmapWidget(RWsSession aWsSession,RWindowTreeNode* aNode)
     {
-     sprite = RWsSprite(aWsSession);     
-     cursorSprite.iBitmap = 0; 
+     sprite = RWsSprite(aWsSession);
+     cursorSprite.iBitmap = 0;
      cursorSprite.iMaskBitmap = 0;
      cursorSprite.iInvertMask = EFalse;
      cursorSprite.iOffset = TPoint(0,0);
@@ -127,8 +127,8 @@ public:
         //### heaplock centralized.
         QImage temp = pm.toImage();
         QSize size = pm.size();
-        temp.bits();        
-        CFbsBitmap *curbm = new (ELeave) CFbsBitmap();
+        temp.bits();
+        CFbsBitmap *curbm = q_check_ptr(new CFbsBitmap());		// CBase derived object needs check on new
         curbm->Create(TSize(size.width(),size.height()),EColor16MA);
         curbm->LockHeap(ETrue);
         memcpy((uchar*)curbm->DataAddress(),temp.bits(),temp.numBytes());
@@ -188,7 +188,7 @@ bool QDragManager::eventFilter(QObject *o, QEvent *e)
     switch(e->type()) {
         case QEvent::MouseButtonPress:
         {
-        }   
+        }
         case QEvent::MouseMove:
         {
             if (!object) { //#### this should not happen
@@ -211,7 +211,7 @@ bool QDragManager::eventFilter(QObject *o, QEvent *e)
                 if (!cw)
                     return true;
                 TPoint windowPos = cw->effectiveWinId()->PositionRelativeToScreen();
-                qt_symbian_dnd_deco->sprite.SetPosition(TPoint(me->globalX()- windowPos.iX,me->globalY()- windowPos.iY));                                
+                qt_symbian_dnd_deco->sprite.SetPosition(TPoint(me->globalX()- windowPos.iX,me->globalY()- windowPos.iY));
 
                 while (cw && !cw->acceptDrops() && !cw->isWindow())
                     cw = cw->parentWidget();
@@ -318,7 +318,7 @@ Qt::DropAction QDragManager::drag(QDrag *o)
     object->d_func()->target = 0;
     TPoint windowPos = source()->effectiveWinId()->PositionRelativeToScreen();
     qt_symbian_dnd_deco->sprite.SetPosition(TPoint(QCursor::pos().x()- windowPos.iX ,QCursor::pos().y() - windowPos.iY));
-    
+
     QPoint hotspot = drag_object->hotSpot();
     qt_symbian_dnd_deco->cursorSprite.iOffset = TPoint(- hotspot.x(),- hotspot.y());
     qt_symbian_dnd_deco->sprite.UpdateMember(0,qt_symbian_dnd_deco->cursorSprite);