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

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  QString::section: Fix crash with SectionIncludeLeadingSep flag
  Expand indicator would not be displayed after removal of a collapsed item's child
  Compile with GCC 3.3
  Fixed rendering bugs when scrolling graphics items with drop shadows.
  2nd part of revert of commit 435bbd4be73768f617e4a
  Revert "ItemViews: make it possible for chekcable items to get partiallyChecked"
  Prevented assert on 1 pixel wide / high images in qt_blurImage.
  skip tst_QDialog::throwInExec on WinCE, ARM platform
  Fix licenseCheck autotest
  Fixes: ODBC Driver expects 16bit when system is 32bit
  Make composition modes work better for DirectFB
  Don't disable alpha when filling with opaque color
  Add support for composition mode DSPD_DST in DFB
  Uncomment #DIRECTFB_DRAWINGOPERATIONS in pri-file
  Fix build breakage in windowflags example

2 files changed, 2 insertions, 2 deletions

diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp
index cd7418a..b151040 100644
--- a/src/corelib/kernel/qmetaobject.cpp
+++ b/src/corelib/kernel/qmetaobject.cpp
@@ -943,7 +943,7 @@ QByteArray QMetaObject::normalizedType(const char *type)
     if (!type || !*type)
         return result;
 
-    QVarLengthArray<char> stackbuf(int(strlen(type)) + 1);
+    QVarLengthArray<char> stackbuf(qstrlen(type) + 1);
     qRemoveWhitespace(type, stackbuf.data());
     int templdepth = 0;
     qNormalizeType(stackbuf.data(), templdepth, result);
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index 3ef0e66..03bc053 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -3185,7 +3185,7 @@ QString QString::section(const QRegExp &reg, int start, int end, SectionFlags fl
         if (!empty || !(flags & SectionSkipEmpty))
             x++;
     }
-    if((flags & SectionIncludeLeadingSep)) {
+    if((flags & SectionIncludeLeadingSep) && first_i < sections.size()) {
         const qt_section_chunk &section = sections.at(first_i);
         ret.prepend(section.string.left(section.length));
     }