From 8679a7caa6d5eedd062e6d194ae3a5e74976f88e Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 13 Apr 2016 16:00:04 +0200 Subject: [PATCH] Debugger: Remove 'Context' label in debugger console This was display only, with no impact on the console operation. Change-Id: I1c6cab13a86b574d3912ea7fca2e0f14147b828c Task-number: QTCREATORBUG-15831 Reviewed-by: Ulf Hermann --- src/plugins/debugger/console/console.cpp | 12 +----------- src/plugins/debugger/console/console.h | 2 -- src/plugins/debugger/qml/qmlengine.cpp | 2 -- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/plugins/debugger/console/console.cpp b/src/plugins/debugger/console/console.cpp index 3ea294ef3e5..796809f7b4a 100644 --- a/src/plugins/debugger/console/console.cpp +++ b/src/plugins/debugger/console/console.cpp @@ -144,8 +144,6 @@ Console::Console() m_spacer = new QWidget(m_consoleWidget); m_spacer->setMinimumWidth(30); - m_statusLabel = new QLabel(m_consoleWidget); - readSettings(); connect(Core::ICore::instance(), &Core::ICore::saveSettingsRequested, this, &Console::writeSettings); @@ -164,8 +162,7 @@ QWidget *Console::outputWidget(QWidget *) QList Console::toolBarWidgets() const { - return { m_showDebugButton, m_showWarningButton, m_showErrorButton, - m_spacer, m_statusLabel }; + return { m_showDebugButton, m_showWarningButton, m_showErrorButton, m_spacer }; } int Console::priorityInStatusBar() const @@ -233,11 +230,6 @@ void Console::readSettings() m_showErrorButtonAction->readSettings(settings); } -void Console::setContext(const QString &context) -{ - m_statusLabel->setText(context); -} - void Console::writeSettings() const { QSettings *settings = Core::ICore::settings(); @@ -249,8 +241,6 @@ void Console::writeSettings() const void Console::setScriptEvaluator(const ScriptEvaluator &evaluator) { m_scriptEvaluator = evaluator; - if (!m_scriptEvaluator) - setContext(QString()); } void Console::printItem(ConsoleItem::ItemType itemType, const QString &text) diff --git a/src/plugins/debugger/console/console.h b/src/plugins/debugger/console/console.h index e6a16ba950c..40a8f1d7a49 100644 --- a/src/plugins/debugger/console/console.h +++ b/src/plugins/debugger/console/console.h @@ -74,7 +74,6 @@ public: bool canNavigate() const; void readSettings(); - void setContext(const QString &context); void setScriptEvaluator(const ScriptEvaluator &evaluator); @@ -92,7 +91,6 @@ private: Utils::SavedAction *m_showWarningButtonAction; Utils::SavedAction *m_showErrorButtonAction; QWidget *m_spacer; - QLabel *m_statusLabel; ConsoleItemModel *m_consoleItemModel; ConsoleView *m_consoleView; QWidget *m_consoleWidget; diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index ba292f29b1a..efac48ae07f 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -1100,8 +1100,6 @@ void QmlEngine::updateCurrentContext() else context = grandParentData->name; } - - debuggerConsole()->setContext(tr("Context:") + QLatin1Char(' ') + context); } void QmlEngine::executeDebuggerCommand(const QString &command, DebuggerLanguages languages)