Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Remove unused source files in designer
  make various POST_LINK steps nicer
  fix qt_webkit_version.pri install for in-Qt builds
  fix windows build with -prefix
  Update to the NTLM code.
  QTextEngine::LayoutData::reallocate musn't corrupt memory
  Updated Twitter demo in response to the new Twitter oauth requirement
  doc: Remove \internal tag from QScriptProgram
  Doc: Reviewed updates to the model/view tutorial.
  QNetworkAccessManager doc: add since tag for added enum
  fixed compilation problem
  added missing files
  added missing files
  problem: 2 images that were in raw html tables appeared smaller in konqueror for some reason - solution: fixed width for right columns in 2 raw html tables
  moving over work from 28b49e42f5bddec2d62e957f158cb848da134db8

1 files changed, 5 insertions, 2 deletions

diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index c30091e..119217a 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -2139,8 +2139,11 @@ bool QTextEngine::LayoutData::reallocate(int totalGlyphs)
 
     void **newMem = memory;
     newMem = (void **)::realloc(memory_on_stack ? 0 : memory, newAllocated*sizeof(void *));
-    Q_CHECK_PTR(newMem);
-    if (memory_on_stack && newMem)
+    if (!newMem) {
+        layoutState = LayoutFailed;
+        return false;
+    }
+    if (memory_on_stack)
         memcpy(newMem, memory, allocated*sizeof(void *));
     memory = newMem;
     memory_on_stack = false;