Merge remote-tracking branch 'origin/4.15'

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Ibd07b5b5ff7c3282134b062ed28b1c4951061c97

src/libs/advanceddockingsystem/dockmanager.cpp

@@ -357,13 +357,20 @@ namespace ADS
         save();
         saveStartupWorkspace();
 
+        // Using a temporal vector since the destructor of
+        // FloatingDockWidgetContainer alters d->m_floatingWidgets.
+        std::vector<FloatingDockContainer *> aboutToDeletes;
         for (auto floatingWidget : qAsConst(d->m_floatingWidgets)) {
-            /* There have been crashes with partially destructed widgets in
-               m_floatingWidgets. Those do not have a parent. */
-            if (floatingWidget && floatingWidget->parent() == this)
-                delete floatingWidget.data();
+            if (floatingWidget)
+                aboutToDeletes.push_back(floatingWidget);
         }
+
+        for (auto del : aboutToDeletes) {
+            delete del;
+        }
+
         d->m_floatingWidgets.clear();
+
         delete d;
     }