diff options
| author | Elvis Angelaccio <[email protected]> | 2017-06-11 19:33:36 +0200 |
|---|---|---|
| committer | Elvis Angelaccio <[email protected]> | 2017-06-11 19:33:36 +0200 |
| commit | 96eff55e75bfd0f1e3f866b4af14f3778e9002b3 (patch) | |
| tree | 22fe4883d7925aa7c919a6364a0d84ee78aea1e4 /src/panels | |
| parent | a2f9e005a5e281b5c4938e86b4a5a85ede63c4b9 (diff) | |
| parent | ec9f4ed17c9c71078eac838060024aef5ca8b2c3 (diff) | |
Merge branch 'Applications/17.04'
* Applications/17.04:
Change in "Open in new tab" feature in Dolphin
Ignore drops-onto-items from invalid places items
Revert "Increase smooth scrolling animation duration from 100 to 300 ms and set easing curve to InOutQuart"
Diffstat (limited to 'src/panels')
| -rw-r--r-- | src/panels/places/placesitemmodel.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp index a4741e746..04dac81b7 100644 --- a/src/panels/places/placesitemmodel.cpp +++ b/src/panels/places/placesitemmodel.cpp @@ -376,6 +376,9 @@ QMimeData* PlacesItemModel::createMimeData(const KItemSet& indexes) const QMimeData* mimeData = new QMimeData(); if (!urls.isEmpty()) { mimeData->setUrls(urls); + } else { + // #378954: prevent itemDropEvent() drops if there isn't a source url. + mimeData->setData(blacklistItemDropEventMimeType(), QByteArrayLiteral("true")); } mimeData->setData(internalMimeType(), itemData); |