forked from qt-creator/qt-creator
Debugger: Only enable C++ language if project says so
Fix a regression from 2.7: A new .qmlproject did also have C++ enabled as a debugger language by default. Instead of reviving the old, hacky logic from 2.7 that directly manipulated the aspect object, the aspect now checks for the actual project language, along the logic of the QML language check. Change-Id: I77c9323fd59079c42874dadf4dc54b9991204d9d Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
This commit is contained in:
@@ -48,10 +48,10 @@ public:
|
||||
DebuggerRunConfigurationAspect(ProjectExplorer::RunConfiguration *runConfiguration,
|
||||
const DebuggerRunConfigurationAspect *other);
|
||||
|
||||
enum QmlDebuggerStatus {
|
||||
DisableQmlDebugger = 0,
|
||||
EnableQmlDebugger,
|
||||
AutoEnableQmlDebugger
|
||||
enum DebuggerLanguageStatus {
|
||||
DisabledLanguage = 0,
|
||||
EnabledLanguage,
|
||||
AutoEnabledLanguage
|
||||
};
|
||||
|
||||
QVariantMap toMap() const;
|
||||
@@ -80,8 +80,8 @@ private:
|
||||
void ctor();
|
||||
|
||||
ProjectExplorer::RunConfiguration *m_runConfiguration;
|
||||
bool m_useCppDebugger;
|
||||
QmlDebuggerStatus m_useQmlDebugger;
|
||||
DebuggerLanguageStatus m_useCppDebugger;
|
||||
DebuggerLanguageStatus m_useQmlDebugger;
|
||||
uint m_qmlDebugServerPort;
|
||||
bool m_useMultiProcess;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user