Reapply unconnected changes from reverted commit

Only revert stuff that is linked to fast string concat.

5 files changed, 10 insertions, 9 deletions

diff --git a/src/plugins/debugger/registerhandler.cpp b/src/plugins/debugger/registerhandler.cpp
index 9b6cb4e015b..b74af0fc265 100644
--- a/src/plugins/debugger/registerhandler.cpp
+++ b/src/plugins/debugger/registerhandler.cpp
@@ -79,18 +79,18 @@ QVariant RegisterHandler::data(const QModelIndex &index, int role) const
         // Return some address associated with the register.
         bool ok = true;
         qulonglong value = reg.value.toULongLong(&ok, 0);
-        return ok ? QString::fromLatin1("0x") + QString::number(value, 16) : QVariant();
+        return ok ? QVariant(QString::fromLatin1("0x") + QString::number(value, 16)) : QVariant();
     }
 
     const QString padding = "  ";
     if (role == Qt::DisplayRole) {
         switch (index.column()) {
-            case 0: return padding + reg.name + padding;
+            case 0: return QVariant(padding + reg.name + padding);
             case 1: {
                 bool ok = true;
                 qulonglong value = reg.value.toULongLong(&ok, 0);
                 QString res = ok ? QString::number(value, m_base) : reg.value;
-                return QString(m_strlen - res.size(), QLatin1Char(' ')) + res;
+                return QVariant(QString(m_strlen - res.size(), QLatin1Char(' ')) + res);
             }
         }
     }
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 83d4fd48137..35a9545c7b8 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -804,7 +804,7 @@ QVariant WatchModel::data(const QModelIndex &idx, int role) const
             switch (idx.column()) {
                 case 0:
                     if (data.name == QLatin1String("*") && item->parent)
-                        return QLatin1Char('*') + item->parent->name;
+                        return QVariant(QLatin1Char('*') + item->parent->name);
                     return data.name;
                 case 1: {
                     int format = m_handler->m_individualFormats.value(data.iname, -1);
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index bba6b55ffd0..38c631ba484 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -139,7 +139,7 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
 
     // FIXME shouldn't the help engine create the directory if it doesn't exist?
     const QFileInfo &fi(m_core->settings()->fileName());
-    const QDir &directory(fi.absolutePath()+"/qtcreator");
+    const QDir directory(fi.absolutePath() + QLatin1String("/qtcreator"));
     if (!directory.exists())
         directory.mkpath(directory.absolutePath());
     m_helpEngine = new QHelpEngine(directory.absolutePath() +
@@ -976,8 +976,8 @@ void HelpPlugin::openHelpPage(const QString& url)
         } else {
             urlPrefix = QLatin1String("http://doc.trolltech.com/latest/");
         }
-        QDesktopServices::openUrl(urlPrefix + url.mid(url
-            .lastIndexOf(QLatin1Char('/')) + 1));
+        QDesktopServices::openUrl(QUrl(urlPrefix + url.mid(url
+            .lastIndexOf(QLatin1Char('/')) + 1)));
     }
 }
 
diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp
index 4f964e64656..d6966754fbd 100644
--- a/src/plugins/projectexplorer/toolchain.cpp
+++ b/src/plugins/projectexplorer/toolchain.cpp
@@ -438,7 +438,8 @@ void MSVCToolChain::addToEnvironment(ProjectExplorer::Environment &env)
                 return;
             QString filename = tf.fileName();
             tf.write("call \"" + varsbat.toLocal8Bit()+"\"\r\n");
-            tf.write(("set > \"" + QDir::tempPath() + "\\qtcreator-msvc-environment.txt\"\r\n").toLocal8Bit());
+            QString redirect = "set > \"" + QDir::tempPath() + "\\qtcreator-msvc-environment.txt\"\r\n";
+            tf.write(redirect.toLocal8Bit());
             tf.flush();
             tf.waitForBytesWritten(30000);
 
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp
index 5e22af5ae51..5c6abb3ccdf 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp
@@ -127,7 +127,7 @@ QList<Core::GeneratedFile>  PluginGenerator::generatePlugin(const GenerationPara
                     QLatin1String(", ") +
                     wo.pluginClassName +
                     QLatin1Char(')') :
-                QLatin1String(""));
+                QString());
         const QString pluginSourceContents = processTemplate(p.templatePath + QLatin1String("/tpl_single.cpp"), sm, errorMessage);
         if (pluginSourceContents.isEmpty())
             return QList<Core::GeneratedFile>();