Merge remote branch 'origin/4.6' into qt-master-from-4.6

Conflicts:
	examples/assistant/simpletextviewer/findfiledialog.cpp
	qmake/generators/symbian/symmake.cpp
	tools/assistant/lib/qhelpgenerator.cpp
	tools/assistant/lib/qhelpsearchquerywidget.cpp
	translations/translations.pri

1 files changed, 5 insertions, 5 deletions

diff --git a/tools/assistant/lib/qhelpcollectionhandler.cpp b/tools/assistant/lib/qhelpcollectionhandler.cpp
index 9fdbd8e..235f737 100644
--- a/tools/assistant/lib/qhelpcollectionhandler.cpp
+++ b/tools/assistant/lib/qhelpcollectionhandler.cpp
@@ -252,7 +252,7 @@ bool QHelpCollectionHandler::createTables(QSqlQuery *query)
         "Key TEXT PRIMARY KEY, "
         "Value BLOB )");
 
-    foreach (QString q, tables) {
+    foreach (const QString &q, tables) {
         if (!query->exec(q))
             return false;
     }
@@ -321,7 +321,7 @@ bool QHelpCollectionHandler::addCustomFilter(const QString &filterName,
             idsToInsert.removeAll(m_query.value(1).toString());
     }
 
-    foreach (QString id, idsToInsert) {
+    foreach (const QString &id, idsToInsert) {
         m_query.prepare(QLatin1String("INSERT INTO FilterAttributeTable VALUES(NULL, ?)"));
         m_query.bindValue(0, id);
         m_query.exec();
@@ -344,7 +344,7 @@ bool QHelpCollectionHandler::addCustomFilter(const QString &filterName,
     m_query.bindValue(0, nameId);
     m_query.exec();
 
-    foreach (QString att, attributes) {
+    foreach (const QString &att, attributes) {
         m_query.prepare(QLatin1String("INSERT INTO FilterTable VALUES(?, ?)"));
         m_query.bindValue(0, nameId);
         m_query.bindValue(1, attributeMap[att]);
@@ -398,7 +398,7 @@ bool QHelpCollectionHandler::registerDocumentation(const QString &fileName)
         return false;
 
     addFilterAttributes(reader.filterAttributes());
-    foreach (QString filterName, reader.customFilters())
+    foreach (const QString &filterName, reader.customFilters())
         addCustomFilter(filterName, reader.filterAttributes(filterName));
 
     optimizeDatabase(fileName);
@@ -497,7 +497,7 @@ bool QHelpCollectionHandler::addFilterAttributes(const QStringList &attributes)
     while (m_query.next())
         atts.insert(m_query.value(0).toString());
 
-    foreach (QString s, attributes) {
+    foreach (const QString &s, attributes) {
         if (!atts.contains(s)) {
             m_query.prepare(QLatin1String("INSERT INTO FilterAttributeTable VALUES(NULL, ?)"));
             m_query.bindValue(0, s);