diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-10-19 15:22:37 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-10-19 15:22:37 +0200 |
| commit | 80951d3e59f8b6ff270333692adfe2d65adf6c9c (patch) | |
| tree | 8a5da6c06f7558d847e24dac386bb60775bd7d76 /src/plugins/autotest | |
| parent | af0e135e7328d5672e54d08ba35765308e554f23 (diff) | |
| parent | 436f111a4609462fcaae501b3d6d9b072adbb0b0 (diff) | |
Merge remote-tracking branch 'origin/4.14' into master
Conflicts:
src/plugins/cppeditor/cppquickfix_test.cpp
Change-Id: Ib2984a3b3d9d071d11304b6cf132c2f8cef77e1c
Diffstat (limited to 'src/plugins/autotest')
| -rw-r--r-- | src/plugins/autotest/boost/boosttestsettingspage.ui | 3 | ||||
| -rw-r--r-- | src/plugins/autotest/testconfiguration.cpp | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/autotest/boost/boosttestsettingspage.ui b/src/plugins/autotest/boost/boosttestsettingspage.ui index 1596cd7d41d..22ddef51f64 100644 --- a/src/plugins/autotest/boost/boosttestsettingspage.ui +++ b/src/plugins/autotest/boost/boosttestsettingspage.ui @@ -10,9 +10,6 @@ <height>284</height> </rect> </property> - <property name="windowTitle"> - <string>Form</string> - </property> <layout class="QVBoxLayout" name="verticalLayout_2"> <item> <layout class="QHBoxLayout" name="horizontalLayout_4"> diff --git a/src/plugins/autotest/testconfiguration.cpp b/src/plugins/autotest/testconfiguration.cpp index 10709e38a61..785abe4f753 100644 --- a/src/plugins/autotest/testconfiguration.cpp +++ b/src/plugins/autotest/testconfiguration.cpp @@ -185,8 +185,11 @@ void TestConfiguration::completeTestInformation(TestRunMode runMode) qCDebug(LOG) << " LocalExecutable" << localExecutable; qCDebug(LOG) << " DeployedExecutable" << deployedExecutable; - qCDebug(LOG) << "Iterating run configurations"; - for (RunConfiguration *runConfig : target->runConfigurations()) { + qCDebug(LOG) << "Iterating run configurations - prefer active over others"; + QList<RunConfiguration *> runConfigurations = target->runConfigurations(); + runConfigurations.removeOne(target->activeRunConfiguration()); + runConfigurations.prepend(target->activeRunConfiguration()); + for (RunConfiguration *runConfig : qAsConst(runConfigurations)) { qCDebug(LOG) << "RunConfiguration" << runConfig->id(); if (!isLocal(target)) { // TODO add device support qCDebug(LOG) << " Skipped as not being local"; |