forked from qt-creator/qt-creator
Debugger: Hide DebuggerRunParameters::m_validationErrors
Task-number: QTCREATORBUG-29168 Change-Id: I718e7177f033c0056ed10cb77d901227acca2930 Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -158,10 +158,10 @@ DebuggerRunParameters DebuggerRunParameters::fromRunControl(ProjectExplorer::Run
|
|||||||
const Tasks tasks = DebuggerKitAspect::validateDebugger(kit);
|
const Tasks tasks = DebuggerKitAspect::validateDebugger(kit);
|
||||||
for (const Task &t : tasks) {
|
for (const Task &t : tasks) {
|
||||||
if (t.type != Task::Warning)
|
if (t.type != Task::Warning)
|
||||||
params.validationErrors.append(t.description());
|
params.m_validationErrors.append(t.description());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
params.validationErrors.append(Tr::tr("The kit does not have a debugger set."));
|
params.m_validationErrors.append(Tr::tr("The kit does not have a debugger set."));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -223,8 +223,8 @@ Result DebuggerRunParameters::fixupParameters(ProjectExplorer::RunControl *runCo
|
|||||||
m_debugger.environment.set(var, m_inferior.environment.expandedValueForKey(var));
|
m_debugger.environment.set(var, m_inferior.environment.expandedValueForKey(var));
|
||||||
|
|
||||||
// validate debugger if C++ debugging is enabled
|
// validate debugger if C++ debugging is enabled
|
||||||
if (!validationErrors.isEmpty())
|
if (!m_validationErrors.isEmpty())
|
||||||
return Result::Error(validationErrors.join('\n'));
|
return Result::Error(m_validationErrors.join('\n'));
|
||||||
|
|
||||||
if (m_isQmlDebugging) {
|
if (m_isQmlDebugging) {
|
||||||
const auto device = runControl->device();
|
const auto device = runControl->device();
|
||||||
|
@@ -241,8 +241,6 @@ public:
|
|||||||
void setTestCase(int testCase) { m_testCase = testCase; }
|
void setTestCase(int testCase) { m_testCase = testCase; }
|
||||||
int testCase() const { return m_testCase; }
|
int testCase() const { return m_testCase; }
|
||||||
|
|
||||||
QStringList validationErrors;
|
|
||||||
|
|
||||||
int qtVersion = 0;
|
int qtVersion = 0;
|
||||||
QString qtNamespace;
|
QString qtNamespace;
|
||||||
|
|
||||||
@@ -337,6 +335,7 @@ private:
|
|||||||
std::optional<int> m_exitCode = {};
|
std::optional<int> m_exitCode = {};
|
||||||
|
|
||||||
int m_testCase = 0; // For Debugger testing.
|
int m_testCase = 0; // For Debugger testing.
|
||||||
|
QStringList m_validationErrors;
|
||||||
};
|
};
|
||||||
|
|
||||||
namespace Internal {
|
namespace Internal {
|
||||||
|
Reference in New Issue
Block a user