aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2022-03-15 15:29:27 +0200
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2022-03-18 08:24:04 +0000
commitde8a67a412acee39a5f3d50855b92e9712536440 (patch)
tree18a231cb5753292802c15e2ffc2ef945c2cde094 /src
parenta23c4ce0143acbb9b3682e29d0d076a9eb7b334d (diff)
QmlDesigner: Add drag support to empty asset library placeholder item
Fixes: QDS-6430 Change-Id: I561f4ed51ccb1e47472adb9baa6e5594eb93eafb Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp15
-rw-r--r--src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.h2
2 files changed, 11 insertions, 6 deletions
diff --git a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
index bed85b99e8..34be8ab46d 100644
--- a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
+++ b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
@@ -218,11 +218,16 @@ void AssetsLibraryWidget::handleExtFilesDrop(const QStringList &simpleFilesPaths
const QString &targetDirPath)
{
if (!simpleFilesPaths.isEmpty()) {
- AddFilesResult result = ModelNodeOperations::addFilesToProject(simpleFilesPaths, targetDirPath);
- if (result == AddFilesResult::Failed) {
- Core::AsynchronousMessageBox::warning(tr("Failed to Add Files"),
- tr("Could not add %1 to project.")
- .arg(simpleFilesPaths.join(' ')));
+ if (targetDirPath.isEmpty()) {
+ addResources(simpleFilesPaths);
+ } else {
+ AddFilesResult result = ModelNodeOperations::addFilesToProject(simpleFilesPaths,
+ targetDirPath);
+ if (result == AddFilesResult::Failed) {
+ Core::AsynchronousMessageBox::warning(tr("Failed to Add Files"),
+ tr("Could not add %1 to project.")
+ .arg(simpleFilesPaths.join(' ')));
+ }
}
}
diff --git a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.h b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.h
index 47a9ce681d..abf91c3a8c 100644
--- a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.h
+++ b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.h
@@ -82,7 +82,7 @@ public:
Q_INVOKABLE void handleSearchfilterChanged(const QString &filterText);
Q_INVOKABLE void handleExtFilesDrop(const QStringList &simpleFilesPaths,
const QStringList &complexFilesPaths,
- const QString &targetDirPath);
+ const QString &targetDirPath = {});
Q_INVOKABLE QSet<QString> supportedAssetSuffixes(bool complex);
signals: