Revert "compile everything with QT_USE_FAST_CONCATENATION"

This reverts commit e70530c5ad85c1c44fca99be04d5e37043d3baca. It
did break builds on older gcc versions (gcc 4.1.2 64 bit Linux,
gcc 4.0.1 on Mac OS X):

parser/qmljsgrammar_p.h: In static member function ???static int
QmlJSGrammar::nt_action(int, int)???:
parser/qmljsgrammar_p.h:188: error: ???QmlJSGrammar::<anonymous enum>???
is/uses anonymous type
parser/qmljsgrammar_p.h:188: error:   trying to instantiate
???template<class T> struct QConcatenable???
...

2 files changed, 4 insertions, 4 deletions

diff --git a/src/plugins/debugger/registerhandler.cpp b/src/plugins/debugger/registerhandler.cpp
index b74af0fc265..9b6cb4e015b 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 ? QVariant(QString::fromLatin1("0x") + QString::number(value, 16)) : QVariant();
+        return ok ? QString::fromLatin1("0x") + QString::number(value, 16) : QVariant();
     }
 
     const QString padding = "  ";
     if (role == Qt::DisplayRole) {
         switch (index.column()) {
-            case 0: return QVariant(padding + reg.name + padding);
+            case 0: return 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 QVariant(QString(m_strlen - res.size(), QLatin1Char(' ')) + res);
+                return QString(m_strlen - res.size(), QLatin1Char(' ')) + res;
             }
         }
     }
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 35a9545c7b8..83d4fd48137 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 QVariant(QLatin1Char('*') + item->parent->name);
+                        return QLatin1Char('*') + item->parent->name;
                     return data.name;
                 case 1: {
                     int format = m_handler->m_individualFormats.value(data.iname, -1);