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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Do check after all if we have partialUpdateSupport.
  QDeclarativeEngineDebugServer: Fix crash when trying to update non-properties.
  Doc: use const& in foreach when applicable.
  QGLBuffer::bind()/release() should not be const functions.
  Use SSSE3 to convert from RGB888 to RGB32
  Extend the build system to SSSE3
  CPU feature detection for x86_64
  Use the appropriate CPUID bitmap for detecting SSE3 etc
  Skip tst_QLineEdit::QTBUG697_paletteCurrentColorGroup on non-x11
  Stabilize tst_qlineedit.cpp
  QScriptEngineAgent:  ensure that the top of the backtrace is correct in exceptionThrow
  Fix QLineEdit's Highlight color when inactive.

1 files changed, 4 insertions, 4 deletions

diff --git a/doc/src/snippets/code/doc_src_containers.qdoc b/doc/src/snippets/code/doc_src_containers.qdoc
index 5cf2aab..1f86f60 100644
--- a/doc/src/snippets/code/doc_src_containers.qdoc
+++ b/doc/src/snippets/code/doc_src_containers.qdoc
@@ -216,7 +216,7 @@ while (i.hasNext())
 //! [17]
 QLinkedList<QString> list;
 ...
-foreach (QString str, list)
+foreach (const QString &str, list)
     qDebug() << str;
 //! [17]
 
@@ -224,7 +224,7 @@ foreach (QString str, list)
 //! [18]
 QLinkedList<QString> list;
 ...
-foreach (QString str, list) {
+foreach (const QString &str, list) {
     if (str.isEmpty())
         break;
     qDebug() << str;
@@ -235,7 +235,7 @@ foreach (QString str, list) {
 //! [19]
 QMap<QString, int> map;
 ...
-foreach (QString str, map.keys())
+foreach (const QString &str, map.keys())
     qDebug() << str << ":" << map.value(str);
 //! [19]
 
@@ -243,7 +243,7 @@ foreach (QString str, map.keys())
 //! [20]
 QMultiMap<QString, int> map;
 ...
-foreach (QString str, map.uniqueKeys()) {
+foreach (const QString &str, map.uniqueKeys()) {
     foreach (int i, map.values(str))
         qDebug() << str << ":" << i;
 }