diff --git a/share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml b/share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml index e7281a6ae9c..0bca2d9a935 100644 --- a/share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml +++ b/share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml @@ -50,11 +50,12 @@ Item { width: parent.width height: parent.height - y - onEntered: (drag)=> { + onEntered: (drag) => { root.updateDropExtFiles(drag) } - onDropped: { + onDropped: (drag) => { + drag.accept() rootView.handleExtFilesDrop(root.dropSimpleExtFiles, root.dropComplexExtFiles, assetsModel.rootPath()) @@ -194,11 +195,12 @@ Item { DropArea { // handles external drop (goes into default folder based on suffix) anchors.fill: parent - onEntered: (drag)=> { + onEntered: (drag) => { root.updateDropExtFiles(drag) } - onDropped: { + onDropped: (drag) => { + drag.accept() rootView.emitExtFilesDrop(root.dropSimpleExtFiles, root.dropComplexExtFiles) } diff --git a/share/qtcreator/qmldesigner/itemLibraryQmlSources/AssetsView.qml b/share/qtcreator/qmldesigner/itemLibraryQmlSources/AssetsView.qml index 20df1018360..dffef336202 100644 --- a/share/qtcreator/qmldesigner/itemLibraryQmlSources/AssetsView.qml +++ b/share/qtcreator/qmldesigner/itemLibraryQmlSources/AssetsView.qml @@ -344,13 +344,14 @@ TreeView { let [row, item] = dropArea.__rowAndItem(drag) if (item) { - root.endDropHover(row) + drag.accept() + root.endDropHover(row) - let dirPath = item.getDirPath() + let dirPath = item.getDirPath() - rootView.emitExtFilesDrop(root.assetsRoot.dropSimpleExtFiles, - root.assetsRoot.dropComplexExtFiles, - dirPath) + rootView.emitExtFilesDrop(root.assetsRoot.dropSimpleExtFiles, + root.assetsRoot.dropComplexExtFiles, + dirPath) } dropArea.__isHoveringDrop = false diff --git a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml index e26c70b5356..c702b445686 100644 --- a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml +++ b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml @@ -503,7 +503,8 @@ Item { materialsSection.highlight = false } - onDrop: { + onDrop: (drag) => { + drag.accept() materialsSection.highlight = false rootView.acceptBundleMaterialDrop() } @@ -587,7 +588,8 @@ Item { highlight = false } - onDrop: { + onDrop: (drag) => { + drag.accept() highlight = false rootView.acceptBundleTextureDrop() } diff --git a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialItem.qml b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialItem.qml index 3512241fd3e..3783cc8c105 100644 --- a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialItem.qml +++ b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialItem.qml @@ -51,6 +51,7 @@ Rectangle { } onDropped: (drag) => { + drag.accept() rootView.acceptTextureDropOnMaterial(index, drag.getDataAsString(drag.keys[0])) } } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml index 61f41d8b9c3..139672e4721 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml @@ -69,7 +69,8 @@ StudioControls.ComboBox { onExited: comboBox.hasActiveHoverDrag = false - onDropped: { + onDropped: (drag) => { + drag.accept() comboBox.backendValue.commitDrop(dropArea.dropData) comboBox.hasActiveHoverDrag = false } diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp index 0b9396028fd..2fa06b1ead3 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp @@ -636,7 +636,7 @@ bool NavigatorTreeModel::dropMimeData(const QMimeData *mimeData, } } - return false; // don't let the view do drag&drop on its own + return true; } void NavigatorTreeModel::handleInternalDrop(const QMimeData *mimeData, diff --git a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp index 5b94a0a0510..fb161a26b03 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp @@ -210,6 +210,7 @@ void NavigatorWidget::dragEnterEvent(QDragEnterEvent *dragEnterEvent) void NavigatorWidget::dropEvent(QDropEvent *dropEvent) { + dropEvent->accept(); const DesignerActionManager &actionManager = QmlDesignerPlugin::instance() ->viewManager().designerActionManager(); actionManager.handleExternalAssetsDrop(dropEvent->mimeData());