Merge remote-tracking branch 'origin/4.14'

Change-Id: Iea84f23cf394de13e99a9ed777c8c113e4eff473
2020-11-19 15:38:13 +01:00
parent b269066435 9b6944086b
commit 5ca70bdcb3
271 changed files with 2816 additions and 1016 deletions
--- a/src/plugins/autotest/autotestplugin.cpp
+++ b/src/plugins/autotest/autotestplugin.cpp
@@ -174,7 +174,7 @@ AutotestPluginPrivate::AutotestPluginPrivate()
 AutotestPluginPrivate::~AutotestPluginPrivate()
 {
    if (!s_projectSettings.isEmpty()) {
-        qDeleteAll(s_projectSettings.values());
+        qDeleteAll(s_projectSettings);
        s_projectSettings.clear();
    }