diff options
Diffstat (limited to 'tools')
4 files changed, 9 insertions, 11 deletions
diff --git a/tools/qmldebugger/standalone/expressionquerywidget.cpp b/tools/qmldebugger/standalone/expressionquerywidget.cpp index 98d9a85..5b7bc8f 100644 --- a/tools/qmldebugger/standalone/expressionquerywidget.cpp +++ b/tools/qmldebugger/standalone/expressionquerywidget.cpp @@ -152,7 +152,7 @@ void ExpressionQueryWidget::showCurrentContext() m_textEdit->setTextColor(Qt::darkGreen); m_textEdit->append(m_currObject.className() + QLatin1String(": ") - + (m_currObject.name().isEmpty() ? QLatin1String("<unnamed>") : m_currObject.name())); + + (m_currObject.name().isEmpty() ? QLatin1String("<unnamed object>") : m_currObject.name())); appendPrompt(); } @@ -189,15 +189,12 @@ void ExpressionQueryWidget::showResult() QVariant value = m_query->result(); QString result; - if (value.isNull()) { + if (value.type() == QVariant::List || value.type() == QVariant::StringList) { + result = tr("<%1 items>", "%1 = number of items").arg(value.toList().count()); + } else if (value.isNull()) { result = QLatin1String("<no value>"); } else { - if (value.canConvert(QVariant::String)) { - result = value.toString(); - } else { - QDebug debug(&result); - debug << value; - } + result = value.toString(); } if (m_mode == SeparateEntryMode) { diff --git a/tools/qmldebugger/standalone/objectpropertiesview.cpp b/tools/qmldebugger/standalone/objectpropertiesview.cpp index 17c5764..abfb7a5 100644 --- a/tools/qmldebugger/standalone/objectpropertiesview.cpp +++ b/tools/qmldebugger/standalone/objectpropertiesview.cpp @@ -181,7 +181,7 @@ void ObjectPropertiesView::setPropertyValue(PropertiesViewItem *item, const QVar item->setExpanded(false); } else { - item->setText(1, (value.isNull() ? QLatin1String("<null>") : value.toString())); + item->setText(1, (value.isNull() ? QLatin1String("<no value>") : value.toString())); item->setExpanded(true); } diff --git a/tools/qmldebugger/standalone/qmldebugger.cpp b/tools/qmldebugger/standalone/qmldebugger.cpp index f4061ed..afcf84c 100644 --- a/tools/qmldebugger/standalone/qmldebugger.cpp +++ b/tools/qmldebugger/standalone/qmldebugger.cpp @@ -57,7 +57,6 @@ QmlDebugger::QmlDebugger(QWidget *parent) QVBoxLayout *layout = new QVBoxLayout; setLayout(layout); - QHBoxLayout *connectLayout = new QHBoxLayout; layout->addLayout(connectLayout); connectLayout->addStretch(2); @@ -101,6 +100,8 @@ QmlDebugger::QmlDebugger(QWidget *parent) this, SLOT(connectionError(QAbstractSocket::SocketError))); m_tabs->setCurrentIndex(1); + + connectToHost(); } void QmlDebugger::setHost(const QString &host) diff --git a/tools/qmldebugger/standalone/watchtable.cpp b/tools/qmldebugger/standalone/watchtable.cpp index b3d3cec..47c1c88 100644 --- a/tools/qmldebugger/standalone/watchtable.cpp +++ b/tools/qmldebugger/standalone/watchtable.cpp @@ -257,7 +257,7 @@ void WatchTableModel::togglePropertyWatch(const QmlDebugObjectReference &object, + QLatin1String(" on\n") + object.className() + QLatin1String(":\n") - + (object.name().isEmpty() ? QLatin1String("<unnamed>") : object.name()); + + (object.name().isEmpty() ? QLatin1String("<unnamed object>") : object.name()); addWatch(watch, desc); emit watchCreated(watch); } |