feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Revert "compile everything with QT_USE_FAST_CONCATENATION"

Browse Source 
This reverts commit e70530c5ad. 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???
...
This commit is contained in:
Kai Koehne
2010-02-08 10:56:50 +01:00
parent b58cb740e5
commit 999c73ad9d
9 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/debugger/registerhandler.cpp
View File

@@ -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;
}
}
}