forked from qt-creator/qt-creator
AutoTest: Merge settings and tools hierarchies [1/2]
Currently living in the settings files to keep changes small, will be renamed in a second step. This allows the settings aspects to be used in their short form and overall removes some indirections. Change-Id: I099369b62239aed8192613a04bca958a660c36c7 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -22,8 +22,6 @@ TestFrameworkManager::TestFrameworkManager()
|
||||
|
||||
TestFrameworkManager::~TestFrameworkManager()
|
||||
{
|
||||
qDeleteAll(m_registeredFrameworks);
|
||||
qDeleteAll(m_registeredTestTools);
|
||||
s_instance = nullptr;
|
||||
}
|
||||
|
||||
@@ -96,14 +94,11 @@ ITestTool *TestFrameworkManager::testToolForBuildSystemId(Id buildSystemId)
|
||||
void TestFrameworkManager::synchronizeSettings()
|
||||
{
|
||||
Internal::testSettings().fromSettings();
|
||||
for (ITestFramework *framework : std::as_const(m_registeredFrameworks)) {
|
||||
if (ITestSettings *fSettings = framework->testSettings())
|
||||
fSettings->readSettings();
|
||||
}
|
||||
for (ITestTool *testTool : std::as_const(m_registeredTestTools)) {
|
||||
if (ITestSettings *tSettings = testTool->testSettings())
|
||||
tSettings->readSettings();
|
||||
}
|
||||
for (ITestFramework *framework : std::as_const(m_registeredFrameworks))
|
||||
framework->readSettings();
|
||||
|
||||
for (ITestTool *testTool : std::as_const(m_registeredTestTools))
|
||||
testTool->readSettings();
|
||||
}
|
||||
|
||||
} // namespace Autotest
|
||||
|
||||
Reference in New Issue
Block a user