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

Conflicts:
	src/gui/kernel/qeventdispatcher_mac.mm
	src/gui/kernel/qt_cocoa_helpers_mac.mm
	src/gui/widgets/qmenu_mac.mm
	tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
	tools/assistant/tools/assistant/centralwidget.cpp
	tools/linguist/lupdate/main.cpp

2 files changed, 2 insertions, 2 deletions

diff --git a/tools/designer/src/lib/uilib/abstractformbuilder.cpp b/tools/designer/src/lib/uilib/abstractformbuilder.cpp
index 1d2d6f8..a0c9e83 100644
--- a/tools/designer/src/lib/uilib/abstractformbuilder.cpp
+++ b/tools/designer/src/lib/uilib/abstractformbuilder.cpp
@@ -364,7 +364,7 @@ QWidget *QAbstractFormBuilder::create(DomWidget *ui_widget, QWidget *parentWidge
     const QStringList zOrderNames = ui_widget->elementZOrder();
     if (!zOrderNames.isEmpty()) {
         QList<QWidget *> zOrder = qVariantValue<QWidgetList>(w->property("_q_zOrder"));
-        foreach (QString widgetName, zOrderNames) {
+        foreach (const QString &widgetName, zOrderNames) {
             if (QWidget *child = qFindChild<QWidget*>(w, widgetName)) {
                 if (child->parentWidget() == w) {
                     zOrder.removeAll(child);
diff --git a/tools/designer/src/lib/uilib/formbuilder.cpp b/tools/designer/src/lib/uilib/formbuilder.cpp
index cc8483f..c97daac 100644
--- a/tools/designer/src/lib/uilib/formbuilder.cpp
+++ b/tools/designer/src/lib/uilib/formbuilder.cpp
@@ -494,7 +494,7 @@ void QFormBuilder::updateCustomWidgets()
 {
     m_customWidgets.clear();
 
-    foreach (QString path, m_pluginPaths) {
+    foreach (const QString &path, m_pluginPaths) {
         const QDir dir(path);
         const QStringList candidates = dir.entryList(QDir::Files);