Merge remote-tracking branch 'origin/5.9' into dev

Conflicts:
	src/widgets/widgets/qmainwindowlayout_p.h

Change-Id: Id406a67606b885052ed405b0fbc8eea7d9d03224

1 files changed, 6 insertions, 1 deletions

diff --git a/src/corelib/io/qloggingregistry.cpp b/src/corelib/io/qloggingregistry.cpp
index eaebbc1ffc..b8d1919ee6 100644
--- a/src/corelib/io/qloggingregistry.cpp
+++ b/src/corelib/io/qloggingregistry.cpp
@@ -365,7 +365,12 @@ void QLoggingRegistry::setApiRules(const QString &content)
 */
 void QLoggingRegistry::updateRules()
 {
-    rules = qtConfigRules + configRules + apiRules + envRules;
+    rules.clear();
+    rules.reserve(qtConfigRules.size() + configRules.size() + apiRules.size() + envRules.size()),
+    rules += qtConfigRules;
+    rules += configRules;
+    rules += apiRules;
+    rules += envRules;
 
     for (auto it = categories.keyBegin(), end = categories.keyEnd(); it != end; ++it)
         (*categoryFilter)(*it);