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

Conflicts:
	bin/syncqt
	demos/declarative/snake/content/snake.js
	demos/declarative/snake/snake.qml
	doc/src/development/qmake-manual.qdoc
	src/corelib/plugin/plugin.pri
	src/gui/kernel/qapplication_win.cpp
	src/gui/kernel/qdesktopwidget_win.cpp
	src/gui/painting/qdrawhelper.cpp
	tests/auto/qdir/tst_qdir.cpp
	tools/qdoc3/test/assistant.qdocconf
	tools/qdoc3/test/designer.qdocconf
	tools/qdoc3/test/linguist.qdocconf

1 files changed, 4 insertions, 4 deletions

diff --git a/tools/activeqt/testcon/changeproperties.cpp b/tools/activeqt/testcon/changeproperties.cpp
index b0609b0..eca1bf9 100644
--- a/tools/activeqt/testcon/changeproperties.cpp
+++ b/tools/activeqt/testcon/changeproperties.cpp
@@ -111,10 +111,10 @@ void ChangeProperties::on_buttonSet_clicked()
 		value = QVariant::fromValue(col);
 	    } else {
 		QMessageBox::warning(this, tr("Can't parse input"), 
-		                            QString(tr("Failed to create a color from %1\n"
+		                           tr("Failed to create a color from %1\n"
 					                "The string has to be a valid color name (e.g. 'red')\n"
 							"or a RGB triple of format '#rrggbb'."
-							).arg(editValue->text())));
+							).arg(editValue->text()));
 	    }
 	}
 	break;
@@ -125,10 +125,10 @@ void ChangeProperties::on_buttonSet_clicked()
 		value = QVariant::fromValue(fnt);
 	    } else {
 		QMessageBox::warning(this, tr("Can't parse input"), 
-		                            (tr("Failed to create a font from %1\n"
+		                           tr("Failed to create a font from %1\n"
 					        "The string has to have a format family,<point size> or\n"
 						"family,pointsize,stylehint,weight,italic,underline,strikeout,fixedpitch,rawmode."
-							).arg(editValue->text())));
+							).arg(editValue->text()));
 	    }
 	}
 	break;