1 files changed, 13 insertions, 2 deletions
diff --git a/src/plugins/autotest/testconfiguration.cpp b/src/plugins/autotest/testconfiguration.cpp
index 38704fe07c..96a5a842db 100644
--- a/src/plugins/autotest/testconfiguration.cpp
+++ b/src/plugins/autotest/testconfiguration.cpp
@@ -31,6 +31,7 @@
 #include <cpptools/projectinfo.h>
 
 #include <projectexplorer/buildconfiguration.h>
+#include <projectexplorer/buildsystem.h>
 #include <projectexplorer/buildtargetinfo.h>
 #include <projectexplorer/deploymentdata.h>
 #include <projectexplorer/environmentaspect.h>
@@ -48,6 +49,11 @@ using namespace Utils;
 
 namespace Autotest {
 
+TestConfiguration::TestConfiguration(ITestFramework *framework)
+    : m_framework(framework)
+{
+}
+
 TestConfiguration::~TestConfiguration()
 {
     m_testCases.clear();
@@ -137,8 +143,9 @@ void TestConfiguration::completeTestInformation(TestRunMode runMode)
 
     const QSet<QString> buildSystemTargets = m_buildTargets;
     qCDebug(LOG) << "BuildSystemTargets\n    " << buildSystemTargets;
+    const QList<BuildTargetInfo> buildTargets = target->buildSystem()->applicationTargets();
     BuildTargetInfo targetInfo
-            = Utils::findOrDefault(target->applicationTargets(),
+            = Utils::findOrDefault(buildTargets,
                                    [&buildSystemTargets] (const BuildTargetInfo &bti) {
         return buildSystemTargets.contains(bti.buildKey);
     });
@@ -146,7 +153,6 @@ void TestConfiguration::completeTestInformation(TestRunMode runMode)
     // there would be no BuildTargetInfo that could match
     if (targetInfo.targetFilePath.isEmpty()) {
         qCDebug(LOG) << "BuildTargetInfos";
-        const QList<BuildTargetInfo> buildTargets = target->applicationTargets();
         // if there is only one build target just use it (but be honest that we're deducing)
         if (buildTargets.size() == 1) {
             targetInfo = buildTargets.first();
@@ -350,4 +356,9 @@ bool TestConfiguration::hasExecutable() const
     return !m_runnable.executable.isEmpty();
 }
 
+ITestFramework *TestConfiguration::framework() const
+{
+    return m_framework;
+}
+
 } // namespace Autotest