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, 2 insertions, 2 deletions

diff --git a/doc/src/snippets/widgets-tutorial/nestedlayouts/main.cpp b/doc/src/snippets/widgets-tutorial/nestedlayouts/main.cpp
index 6a49be8..35d2fa7 100644
--- a/doc/src/snippets/widgets-tutorial/nestedlayouts/main.cpp
+++ b/doc/src/snippets/widgets-tutorial/nestedlayouts/main.cpp
@@ -72,9 +72,9 @@ int main(int argc, char *argv[])
         << (QStringList() << "David Bradley" << "42")
         << (QStringList() << "Knut Walters" << "25")
         << (QStringList() << "Andrea Jones" << "34");
-    foreach (QStringList row, rows) {
+    foreach (const QStringList &row, rows) {
         QList<QStandardItem *> items;
-        foreach (QString text, row)
+        foreach (const QString &text, row)
             items.append(new QStandardItem(text));
         model.appendRow(items);
     }