Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui

Conflicts:
	tools/qdoc3/doc.cpp

5 files changed, 13 insertions, 13 deletions

diff --git a/tools/linguist/linguist/mainwindow.cpp b/tools/linguist/linguist/mainwindow.cpp
index 921b8b6..f91175d 100644
--- a/tools/linguist/linguist/mainwindow.cpp
+++ b/tools/linguist/linguist/mainwindow.cpp
@@ -127,7 +127,7 @@ static Ending ending(QString str, QLocale::Language lang)
 
     switch (ch) {
     case 0x002e: // full stop
-        if (str.endsWith(QString(QLatin1String("..."))))
+        if (str.endsWith(QLatin1String("...")))
             return End_Ellipsis;
         else
             return End_FullStop;
diff --git a/tools/linguist/linguist/phrase.cpp b/tools/linguist/linguist/phrase.cpp
index 300f6e8..b1f9818 100644
--- a/tools/linguist/linguist/phrase.cpp
+++ b/tools/linguist/linguist/phrase.cpp
@@ -152,10 +152,10 @@ bool QphHandler::startElement(const QString & /* namespaceURI */,
                               const QString &qName,
                               const QXmlAttributes &atts)
 {
-    if (qName == QString(QLatin1String("QPH"))) {
+    if (qName == QLatin1String("QPH")) {
         m_language = atts.value(QLatin1String("language"));
         m_sourceLanguage = atts.value(QLatin1String("sourcelanguage"));
-    } else if (qName == QString(QLatin1String("phrase"))) {
+    } else if (qName == QLatin1String("phrase")) {
         source.truncate(0);
         target.truncate(0);
         definition.truncate(0);
@@ -168,13 +168,13 @@ bool QphHandler::endElement(const QString & /* namespaceURI */,
                             const QString & /* localName */,
                             const QString &qName)
 {
-    if (qName == QString(QLatin1String("source")))
+    if (qName == QLatin1String("source"))
         source = accum;
-    else if (qName == QString(QLatin1String("target")))
+    else if (qName == QLatin1String("target"))
         target = accum;
-    else if (qName == QString(QLatin1String("definition")))
+    else if (qName == QLatin1String("definition"))
         definition = accum;
-    else if (qName == QString(QLatin1String("phrase")))
+    else if (qName == QLatin1String("phrase"))
         pb->m_phrases.append(new Phrase(source, target, definition, pb));
     return true;
 }
diff --git a/tools/linguist/lupdate/merge.cpp b/tools/linguist/lupdate/merge.cpp
index c4f4448..4849d6e 100644
--- a/tools/linguist/lupdate/merge.cpp
+++ b/tools/linguist/lupdate/merge.cpp
@@ -193,7 +193,7 @@ static QString translationAttempt(const QString &oldTranslation,
     */
     for (k = 0; k < p; k++) {
         if (!met[k])
-            attempt += QString(QLatin1String(" {")) + newNumbers[k] + QString(QLatin1String("?}"));
+            attempt += QLatin1String(" {") + newNumbers[k] + QLatin1String("?}");
     }
 
     /*
@@ -205,8 +205,8 @@ static QString translationAttempt(const QString &oldTranslation,
         for (ell = 0; ell < p; ell++) {
             if (k != ell && oldNumbers[k] == oldNumbers[ell] &&
                     newNumbers[k] < newNumbers[ell])
-                attempt += QString(QLatin1String(" {")) + newNumbers[k] + QString(QLatin1String(" or ")) +
-                           newNumbers[ell] + QString(QLatin1String("?}"));
+                attempt += QLatin1String(" {") + newNumbers[k] + QLatin1String(" or ") +
+                           newNumbers[ell] + QLatin1String("?}");
         }
     }
     return attempt;
diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp
index 0be6bec..ae46ad8 100644
--- a/tools/linguist/shared/profileevaluator.cpp
+++ b/tools/linguist/shared/profileevaluator.cpp
@@ -894,7 +894,7 @@ QStringList ProFileEvaluator::Private::qmakeFeaturePaths()
 {
     QStringList concat;
     {
-        const QString base_concat = QDir::separator() + QString(QLatin1String("features"));
+        const QString base_concat = QDir::separator() + QLatin1String("features");
         concat << base_concat + QDir::separator() + QLatin1String("mac");
         concat << base_concat + QDir::separator() + QLatin1String("macx");
         concat << base_concat + QDir::separator() + QLatin1String("unix");
@@ -903,7 +903,7 @@ QStringList ProFileEvaluator::Private::qmakeFeaturePaths()
         concat << base_concat + QDir::separator() + QLatin1String("qnx6");
         concat << base_concat;
     }
-    const QString mkspecs_concat = QDir::separator() + QString(QLatin1String("mkspecs"));
+    const QString mkspecs_concat = QDir::separator() + QLatin1String("mkspecs");
     QStringList feature_roots;
     QByteArray mkspec_path = qgetenv("QMAKEFEATURES");
     if (!mkspec_path.isNull())
diff --git a/tools/linguist/shared/proparserutils.h b/tools/linguist/shared/proparserutils.h
index c27c3c0..3eab43f 100644
--- a/tools/linguist/shared/proparserutils.h
+++ b/tools/linguist/shared/proparserutils.h
@@ -282,7 +282,7 @@ static QStringList split_value_list(const QString &vals, bool do_semicolon=false
 static QStringList qmake_mkspec_paths()
 {
     QStringList ret;
-    const QString concat = QDir::separator() + QString(QLatin1String("mkspecs"));
+    const QString concat = QDir::separator() + QLatin1String("mkspecs");
     QByteArray qmakepath = qgetenv("QMAKEPATH");
     if (!qmakepath.isEmpty()) {
         const QStringList lst = splitPathList(QString::fromLocal8Bit(qmakepath));