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

Debugger: Change default languages to NoLanguages

Browse Source 
... which is set to CppLanguage in DebuggerRunControlCreator::enrich
unless set to anything else previously.

Remove related hacks.

Change-Id: I5fcc39326e280192eb1ddb652636e9342baef94b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2016-04-13 09:04:57 +03:00
committed by Orgad Shaneh
parent c75b8f22fa
commit 6655f87fca
3 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/debugger/debuggerdialogs.cpp
View File

@@ -411,7 +411,6 @@ bool StartApplicationDialog::run(QWidget *parent, DebuggerRunParameters *rp, Kit
rp->breakOnMain = newParameters.breakAtMain; rp->breakOnMain = newParameters.breakAtMain;
rp->serverStartScript = newParameters.serverStartScript; rp->serverStartScript = newParameters.serverStartScript;
rp->debugInfoLocation = newParameters.debugInfoLocation; rp->debugInfoLocation = newParameters.debugInfoLocation;
rp->languages = CppLanguage;
Kit *k = dialog.d->kitChooser->currentKit(); Kit *k = dialog.d->kitChooser->currentKit();
IDevice::ConstPtr dev = DeviceKitInformation::device(k); IDevice::ConstPtr dev = DeviceKitInformation::device(k);

2
src/plugins/debugger/debuggerengine.h
View File

@@ -84,7 +84,7 @@ public:
DebuggerEngineType masterEngineType = NoEngineType; DebuggerEngineType masterEngineType = NoEngineType;
DebuggerEngineType cppEngineType = NoEngineType; DebuggerEngineType cppEngineType = NoEngineType;
DebuggerLanguages languages = AnyLanguage; DebuggerLanguages languages = NoLanguage;
bool breakOnMain = false; bool breakOnMain = false;
bool multiProcess = false; // Whether to set detach-on-fork off. bool multiProcess = false; // Whether to set detach-on-fork off.

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

@@ -1173,7 +1173,6 @@ bool DebuggerPluginPrivate::parseArgument(QStringList::const_iterator &it,
} }
DebuggerRunParameters rp; DebuggerRunParameters rp;
rp.startMode = AttachCrashedExternal; rp.startMode = AttachCrashedExternal;
rp.languages = CppLanguage;
rp.crashParameter = it->section(QLatin1Char(':'), 0, 0); rp.crashParameter = it->section(QLatin1Char(':'), 0, 0);
rp.attachPID = it->section(QLatin1Char(':'), 1, 1).toULongLong(); rp.attachPID = it->section(QLatin1Char(':'), 1, 1).toULongLong();
rp.displayName = tr("Crashed process %1").arg(rp.attachPID); rp.displayName = tr("Crashed process %1").arg(rp.attachPID);