aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/debugger/watchhandler.cpp
diff options
context:
space:
mode:
authorKai Koehne <[email protected]>2010-02-08 10:56:50 +0100
committerKai Koehne <[email protected]>2010-02-08 10:56:50 +0100
commit999c73ad9daf23a4883f76b87d0aaf43d9032629 (patch)
tree99aa61d9eb0efa425914ed483a2a8446cfb356e5 /src/plugins/debugger/watchhandler.cpp
parentb58cb740e5e08f7a11a7b176a97351bf49b0d52a (diff)
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??? ...
Diffstat (limited to 'src/plugins/debugger/watchhandler.cpp')
-rw-r--r--src/plugins/debugger/watchhandler.cpp2
1 files changed, 1 insertions, 1 deletions
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);