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

diff --git a/src/3rdparty/phonon/gstreamer/mediaobject.cpp b/src/3rdparty/phonon/gstreamer/mediaobject.cpp
index 3e0addc..23a60c0 100644
--- a/src/3rdparty/phonon/gstreamer/mediaobject.cpp
+++ b/src/3rdparty/phonon/gstreamer/mediaobject.cpp
@@ -219,9 +219,9 @@ void MediaObject::noMorePadsAvailable ()
         if ( status != GST_INSTALL_PLUGINS_STARTED_OK )
         {
             if( status == GST_INSTALL_PLUGINS_HELPER_MISSING )
-                setError(QString(tr("Missing codec helper script assistant.")), Phonon::FatalError );
+                setError(tr("Missing codec helper script assistant."), Phonon::FatalError );
             else
-                setError(QString(tr("Plugin codec installation failed for codec: %0"))
+                setError(tr("Plugin codec installation failed for codec: %0")
                         .arg(m_missingCodecs[0].split("|")[3]), error);
         }
         m_missingCodecs.clear();
@@ -232,7 +232,7 @@ void MediaObject::noMorePadsAvailable ()
             m_hasVideo = false;
             emit hasVideoChanged(false);
         }
-        setError(QString(tr("A required codec is missing. You need to install the following codec(s) to play this content: %0")).arg(codecs), error);
+        setError(tr("A required codec is missing. You need to install the following codec(s) to play this content: %0").arg(codecs), error);
         m_missingCodecs.clear();
 #endif
     }