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

diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp
index a3dd83e..7f82365 100644
--- a/src/gui/text/qtextformat.cpp
+++ b/src/gui/text/qtextformat.cpp
@@ -3041,12 +3041,18 @@ int QTextFormatCollection::indexForFormat(const QTextFormat &format)
     int idx = formats.size();
     formats.append(format);
 
-    QTextFormat &f = formats.last();
-    if (!f.d)
-        f.d = new QTextFormatPrivate;
-    f.d->resolveFont(defaultFnt);
+    QT_TRY{
+        QTextFormat &f = formats.last();
+        if (!f.d)
+            f.d = new QTextFormatPrivate;
+        f.d->resolveFont(defaultFnt);
 
-    hashes.insert(hash);
+        hashes.insert(hash);
+
+    } QT_CATCH(...) {
+        formats.pop_back();
+        QT_RETHROW;
+    }
     return idx;
 }