diff options
Diffstat (limited to 'src/declarative/debugger')
-rw-r--r-- | src/declarative/debugger/qmldebugger.cpp | 3 | ||||
-rw-r--r-- | src/declarative/debugger/qmlpropertyview.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/debugger/qmldebugger.cpp b/src/declarative/debugger/qmldebugger.cpp index c925148..9ab3247 100644 --- a/src/declarative/debugger/qmldebugger.cpp +++ b/src/declarative/debugger/qmldebugger.cpp @@ -282,7 +282,7 @@ bool QmlDebugger::makeItem(QObject *obj, QmlDebuggerItem *item) if(!toolTipString.isEmpty()) toolTipString.prepend(QLatin1Char('\n')); toolTipString.prepend(tr("Root type: ") + text); - text = p->typeName; + text = QString::fromAscii(p->typeName); } if(!toolTipString.isEmpty()) @@ -333,6 +333,7 @@ bool operator<(const QPair<quint32, QPair<int, QString> > &lhs, void QmlDebugger::setCanvas(QSimpleCanvas *c) { + Q_UNUSED(c); } void QmlDebugger::setDebugObject(QObject *obj) diff --git a/src/declarative/debugger/qmlpropertyview.cpp b/src/declarative/debugger/qmlpropertyview.cpp index 0d34fd9..abe1902 100644 --- a/src/declarative/debugger/qmlpropertyview.cpp +++ b/src/declarative/debugger/qmlpropertyview.cpp @@ -210,7 +210,7 @@ void QmlPropertyView::setObject(QObject *object) ++iter) { QTreeWidgetItem *item = new QTreeWidgetItem(m_tree); - item->setText(0, iter.key()); + item->setText(0, QString::fromAscii(iter.key())); item->setForeground(0, Qt::blue); item->setText(1, iter.value()); } |