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

debugger: disable unfinished debugger console code for the 2.1 release

Browse Source 
Reviewed-by: Friedemann Kleint
This commit is contained in:
hjk
2010-10-13 13:34:27 +02:00
parent 410523d32d
commit 01e3948c16
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -999,7 +999,7 @@ public:
QComboBox *m_threadBox;
QDockWidget *m_breakDock;
QDockWidget *m_consoleDock;
//QDockWidget *m_consoleDock;
QDockWidget *m_modulesDock;
QDockWidget *m_outputDock;
QDockWidget *m_registerDock;
@@ -1013,7 +1013,7 @@ public:
DebuggerActions m_actions;
BreakWindow *m_breakWindow;
ConsoleWindow *m_consoleWindow;
//ConsoleWindow *m_consoleWindow;
QTreeView *m_returnWindow;
QTreeView *m_localsWindow;
QTreeView *m_watchersWindow;
@@ -1047,7 +1047,7 @@ DebuggerPluginPrivate::DebuggerPluginPrivate(DebuggerPlugin *plugin)
m_threadBox = 0;
m_breakDock = 0;
m_consoleDock = 0;
//m_consoleDock = 0;
m_modulesDock = 0;
m_outputDock = 0;
m_registerDock = 0;
@@ -1126,8 +1126,8 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, QString *er
m_breakWindow = new BreakWindow;
m_breakWindow->setObjectName(QLatin1String("CppDebugBreakpoints"));
m_consoleWindow = new ConsoleWindow;
m_consoleWindow->setObjectName(QLatin1String("CppDebugConsole"));
//m_consoleWindow = new ConsoleWindow;
//m_consoleWindow->setObjectName(QLatin1String("CppDebugConsole"));
m_modulesWindow = new ModulesWindow;
m_modulesWindow->setObjectName(QLatin1String("CppDebugModules"));
m_logWindow = new LogWindow;
@@ -1294,9 +1294,9 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, QString *er
m_breakDock = m_uiSwitcher->createDockWidget(CppLanguage, m_breakWindow);
m_breakDock->setObjectName(QString(DOCKWIDGET_BREAK));
m_consoleDock = m_uiSwitcher->createDockWidget(CppLanguage, m_consoleWindow,
Qt::TopDockWidgetArea);
m_consoleDock->setObjectName(QString(DOCKWIDGET_OUTPUT));
//m_consoleDock = m_uiSwitcher->createDockWidget(CppLanguage, m_consoleWindow,
// Qt::TopDockWidgetArea);
//m_consoleDock->setObjectName(QString(DOCKWIDGET_OUTPUT));
m_modulesDock = m_uiSwitcher->createDockWidget(CppLanguage, m_modulesWindow,
Qt::TopDockWidgetArea);
@@ -2111,7 +2111,7 @@ void DebuggerPluginPrivate::fontSettingsChanged
changeFontSize(m_logWindow, size);
changeFontSize(m_localsWindow, size);
changeFontSize(m_modulesWindow, size);
changeFontSize(m_consoleWindow, size);
//changeFontSize(m_consoleWindow, size);
changeFontSize(m_registerWindow, size);
changeFontSize(m_returnWindow, size);
changeFontSize(m_sourceFilesWindow, size);
@@ -2150,7 +2150,7 @@ void DebuggerPluginPrivate::setBusyCursor(bool busy)
m_busy = busy;
QCursor cursor(busy ? Qt::BusyCursor : Qt::ArrowCursor);
m_breakWindow->setCursor(cursor);
m_consoleWindow->setCursor(cursor);
//m_consoleWindow->setCursor(cursor);
m_localsWindow->setCursor(cursor);
m_modulesWindow->setCursor(cursor);
m_logWindow->setCursor(cursor);
@@ -2178,7 +2178,7 @@ void DebuggerPluginPrivate::setSimpleDockWidgetArrangement
}
foreach (QDockWidget *dockWidget, dockWidgets) {
if (dockWidget == m_outputDock || dockWidget == m_consoleDock) {
if (dockWidget == m_outputDock /*|| dockWidget == m_consoleDock*/) {
mw->addDockWidget(Qt::TopDockWidgetArea, dockWidget);
} else {
mw->addDockWidget(Qt::BottomDockWidgetArea, dockWidget);
@@ -2701,7 +2701,7 @@ void DebuggerPlugin::showMessage(const QString &msg, int channel, int timeout)
{
//qDebug() << "PLUGIN OUTPUT: " << channel << msg;
LogWindow *ow = d->m_logWindow;
ConsoleWindow *cw = d->m_consoleWindow;
//ConsoleWindow *cw = d->m_consoleWindow;
QTC_ASSERT(ow, return);
switch (channel) {
case StatusBar:
@@ -2721,7 +2721,7 @@ void DebuggerPlugin::showMessage(const QString &msg, int channel, int timeout)
break;
default:
ow->showOutput(channel, msg);
cw->showOutput(channel, msg);
//cw->showOutput(channel, msg);
break;
}
}