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

Debugger: Don't scan directories that do not exist.

Browse Source 
Change-Id: Ie79249039643041fd68da6766b0e6f3ca6080b86
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2013-04-19 15:01:55 +02:00
parent 2d568e79c4
commit 4d6ce81e0c
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/debuggerrunner.cpp
View File

@@ -472,9 +472,9 @@ DebuggerRunControl *DebuggerRunControlFactory::doCreate
(const DebuggerStartParameters &sp0, RunConfiguration *rc, QString *errorMessage) (const DebuggerStartParameters &sp0, RunConfiguration *rc, QString *errorMessage)
{ {
TaskHub *th = ProjectExplorerPlugin::instance()->taskHub(); TaskHub *th = ProjectExplorerPlugin::instance()->taskHub();
th->clearTasks(Core::Id(Debugger::Constants::TASK_CATEGORY_DEBUGGER_DEBUGINFO)); th->clearTasks(Debugger::Constants::TASK_CATEGORY_DEBUGGER_DEBUGINFO);
th->clearTasks(Core::Id(Debugger::Constants::TASK_CATEGORY_DEBUGGER_TEST)); th->clearTasks(Debugger::Constants::TASK_CATEGORY_DEBUGGER_TEST);
th->clearTasks(Core::Id(Debugger::Constants::TASK_CATEGORY_DEBUGGER_RUNTIME)); th->clearTasks(Debugger::Constants::TASK_CATEGORY_DEBUGGER_RUNTIME);
DebuggerStartParameters sp = sp0; DebuggerStartParameters sp = sp0;
if (!debuggerCore()->boolSetting(AutoEnrichParameters)) { if (!debuggerCore()->boolSetting(AutoEnrichParameters)) {
@@ -486,8 +486,6 @@ DebuggerRunControl *DebuggerRunControlFactory::doCreate
sp.debugSourceLocation.append(base + QLatin1String("qt5base/src/corelib")); sp.debugSourceLocation.append(base + QLatin1String("qt5base/src/corelib"));
sp.debugSourceLocation.append(base + QLatin1String("qt5base/src/gui")); sp.debugSourceLocation.append(base + QLatin1String("qt5base/src/gui"));
sp.debugSourceLocation.append(base + QLatin1String("qt5base/src/network")); sp.debugSourceLocation.append(base + QLatin1String("qt5base/src/network"));
sp.debugSourceLocation.append(base + QLatin1String("qt5base/src/v8"));
sp.debugSourceLocation.append(base + QLatin1String("qt5declarative/src/qml"));
} }
} }

8
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -4870,8 +4870,12 @@ void GdbEngine::startGdb(const QStringList &args)
+ " " + it.value().toLocal8Bit()); + " " + it.value().toLocal8Bit());
// Spaces just will not work. // Spaces just will not work.
foreach (const QString &src, sp.debugSourceLocation) foreach (const QString &src, sp.debugSourceLocation) {
postCommand("directory " + src.toLocal8Bit()); if (QDir(src).exists())
postCommand("directory " + src.toLocal8Bit());
else
showMessage(_("# directory does not exist: ") + src, LogInput);
}
const QByteArray sysroot = sp.sysRoot.toLocal8Bit(); const QByteArray sysroot = sp.sysRoot.toLocal8Bit();
if (!sysroot.isEmpty()) { if (!sysroot.isEmpty()) {