diff options
Diffstat (limited to 'src/plugins/autotest/qtest/qttestresult.cpp')
| -rw-r--r-- | src/plugins/autotest/qtest/qttestresult.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/plugins/autotest/qtest/qttestresult.cpp b/src/plugins/autotest/qtest/qttestresult.cpp index 65ec0c8270..44daaf4aeb 100644 --- a/src/plugins/autotest/qtest/qttestresult.cpp +++ b/src/plugins/autotest/qtest/qttestresult.cpp @@ -28,7 +28,7 @@ #include "../testtreeitem.h" #include "../quick/quicktestframework.h" // FIXME BAD! - but avoids declaring QuickTestResult -#include <coreplugin/id.h> +#include <utils/id.h> #include <utils/qtcassert.h> namespace Autotest { @@ -131,12 +131,14 @@ TestResult *QtTestResult::createIntermediateResultFor(const TestResult *other) const TestTreeItem *QtTestResult::findTestTreeItem() const { - Core::Id id; + Utils::Id id; if (m_type == TestType::QtTest) - id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix(QtTest::Constants::FRAMEWORK_NAME); + id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix(QtTest::Constants::FRAMEWORK_NAME); else - id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix(QuickTest::Constants::FRAMEWORK_NAME); - const TestTreeItem *rootNode = TestFrameworkManager::instance()->rootNodeForTestFramework(id); + id = Utils::Id(Constants::FRAMEWORK_PREFIX).withSuffix(QuickTest::Constants::FRAMEWORK_NAME); + ITestFramework *framework = TestFrameworkManager::frameworkForId(id); + QTC_ASSERT(framework, return nullptr); + const TestTreeItem *rootNode = framework->rootNode(); QTC_ASSERT(rootNode, return nullptr); const auto item = rootNode->findAnyChild([this](const Utils::TreeItem *item) { |