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, 24 insertions, 5 deletions

diff --git a/src/gui/kernel/qboxlayout.cpp b/src/gui/kernel/qboxlayout.cpp
index 23d20ff9b1..a7802afac1 100644
--- a/src/gui/kernel/qboxlayout.cpp
+++ b/src/gui/kernel/qboxlayout.cpp
@@ -925,9 +925,15 @@ void QBoxLayout::insertSpacing(int index, int size)
     else
         b = QLayoutPrivate::createSpacerItem(this, 0, size, QSizePolicy::Minimum, QSizePolicy::Fixed);
 
-    QBoxLayoutItem *it = new QBoxLayoutItem(b);
-    it->magic = true;
-    d->list.insert(index, it);
+    QT_TRY {
+        QBoxLayoutItem *it = new QBoxLayoutItem(b);
+        it->magic = true;
+        d->list.insert(index, it);
+
+    } QT_CATCH(...) {
+        delete b;
+        QT_RETHROW;
+    }
     invalidate();
 }
 
@@ -1027,8 +1033,21 @@ void QBoxLayout::insertWidget(int index, QWidget *widget, int stretch,
         index = d->list.count();
     QWidgetItem *b = QLayoutPrivate::createWidgetItem(this, widget);
     b->setAlignment(alignment);
-    QBoxLayoutItem *it = new QBoxLayoutItem(b, stretch);
-    d->list.insert(index, it);
+
+    QBoxLayoutItem *it;
+    QT_TRY{
+        it = new QBoxLayoutItem(b, stretch);
+    } QT_CATCH(...) {
+        delete b;
+        QT_RETHROW;
+    }
+
+    QT_TRY{
+        d->list.insert(index, it);
+    } QT_CATCH(...) {
+        delete it;
+        QT_RETHROW;
+    }
     invalidate();
 }