aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/autotest/autotestplugin.cpp
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@qt.io>2016-06-06 15:35:00 +0200
committerChristian Stenger <christian.stenger@qt.io>2016-06-14 11:05:35 +0000
commit8cba580343b2aca6c2fe60dd773480c80a3feda9 (patch)
tree04d597fa9e367d40ab904a6bcbaff79f7e51ca74 /src/plugins/autotest/autotestplugin.cpp
parentc64fa0d3292f8c2a849783738075197038a69dfe (diff)
AutoTest: Introduce active state for test frameworks
Change-Id: I0fddce91a239c0a51352a25e34a221fd8880b733 Reviewed-by: David Schulz <david.schulz@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'src/plugins/autotest/autotestplugin.cpp')
-rw-r--r--src/plugins/autotest/autotestplugin.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/autotest/autotestplugin.cpp b/src/plugins/autotest/autotestplugin.cpp
index df8ece06ea..9e053f1b09 100644
--- a/src/plugins/autotest/autotestplugin.cpp
+++ b/src/plugins/autotest/autotestplugin.cpp
@@ -134,7 +134,6 @@ bool AutotestPlugin::initialize(const QStringList &arguments, QString *errorStri
m_frameworkManager->registerTestFramework(new QtTestFramework);
m_frameworkManager->registerTestFramework(new QuickTestFramework);
m_frameworkManager->registerTestFramework(new GTestFramework);
- TestTreeModel::instance()->syncTestFrameworks();
m_settings->fromSettings(ICore::settings());
addAutoReleasedObject(new TestSettingsPage(m_settings));
@@ -143,6 +142,8 @@ bool AutotestPlugin::initialize(const QStringList &arguments, QString *errorStri
if (m_settings->alwaysParse)
TestTreeModel::instance()->enableParsingFromSettings();
+ m_frameworkManager->activateFrameworksFromSettings(m_settings);
+ TestTreeModel::instance()->syncTestFrameworks();
return true;
}