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

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Do not crash when loading themed icons statically
  Doc: document what the timeout of -1 means in D-Bus
  Avoid QString reallocation in QTextEngine

1 files changed, 6 insertions, 0 deletions

diff --git a/tests/auto/qicon/tst_qicon.cpp b/tests/auto/qicon/tst_qicon.cpp
index f861e40..fae9cc0 100644
--- a/tests/auto/qicon/tst_qicon.cpp
+++ b/tests/auto/qicon/tst_qicon.cpp
@@ -86,8 +86,14 @@ private slots:
 
 private:
     QString oldCurrentDir;
+
+    const static QIcon staticIcon;
 };
 
+// Creating an icon statically should not cause a crash. 
+// But we do not officially support this. See QTBUG-8666
+const QIcon tst_QIcon::staticIcon = QIcon::fromTheme("edit-find");
+
 void tst_QIcon::init()
 {
     QString srcdir(QLatin1String(SRCDIR));