Merge remote-tracking branch 'origin/qds/dev'

Conflicts:
	doc/qtcreator/src/overview/creator-only/creator-keyboard-shortcuts.qdoc
	doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc
	doc/qtcreator/src/qtquick/qtquick-profiler.qdoc
	src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
	src/plugins/remotelinux/linuxdevicetester.cpp

Change-Id: I3683c1799df05209d05413383456b285a2daf96e

1 files changed, 16 insertions, 0 deletions

diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionView.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionView.qml
index acf82fe452..9d483037ac 100644
--- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionView.qml
+++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionView.qml
@@ -28,6 +28,12 @@ Item {
         print("TODO: deleteSelectedCollection")
     }
 
+    function closeDialogs() {
+        importDialog.reject()
+        newCollection.reject()
+        warningDialog.reject()
+    }
+
     ImportDialog {
         id: importDialog
 
@@ -147,6 +153,8 @@ Item {
             }
 
             CollectionListView { // Model Groups
+                id: collectionListView
+
                 Layout.fillWidth: true
                 Layout.minimumHeight: bottomSpacer.isExpanded ? 150 : 0
                 Layout.fillHeight: !bottomSpacer.isExpanded
@@ -187,4 +195,12 @@ Item {
             SplitView.fillWidth: true
         }
     }
+
+    Connections {
+        target: root.model
+
+        function onModelReset() {
+            root.closeDialogs()
+        }
+    }
 }