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/qfontdatabase/main.cpp b/doc/src/snippets/qfontdatabase/main.cpp
index 7f939de..1b8ff42 100644
--- a/doc/src/snippets/qfontdatabase/main.cpp
+++ b/doc/src/snippets/qfontdatabase/main.cpp
@@ -50,11 +50,11 @@ int main(int argc, char **argv)
     fontTree.setColumnCount(2);
     fontTree.setHeaderLabels(QStringList() << "Font" << "Smooth Sizes");
 
-    foreach (QString family, database.families()) {
+    foreach (const QString &family, database.families()) {
         QTreeWidgetItem *familyItem = new QTreeWidgetItem(&fontTree);
         familyItem->setText(0, family);
 
-        foreach (QString style, database.styles(family)) {
+        foreach (const QString &style, database.styles(family)) {
             QTreeWidgetItem *styleItem = new QTreeWidgetItem(familyItem);
             styleItem->setText(0, style);