diff options
| author | Luca Beltrame <[email protected]> | 2014-09-21 14:36:02 +0200 |
|---|---|---|
| committer | Luca Beltrame <[email protected]> | 2014-09-21 14:36:02 +0200 |
| commit | 4479a546bda708cad514412e8cf749c11caa0697 (patch) | |
| tree | 83c15fe3bae4216be42c2c659ff4b1a3efff7f86 /src/panels | |
| parent | 4a774cb250cc4133f6f6d3fe6156d481ff82c2e8 (diff) | |
| parent | 398162a1be83d7f3c3645b44a10a165f769e5f59 (diff) | |
Merge branch 'KDE/4.14'
Diffstat (limited to 'src/panels')
| -rw-r--r-- | src/panels/places/placesitemmodel.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp index d906118f2..6accdc837 100644 --- a/src/panels/places/placesitemmodel.cpp +++ b/src/panels/places/placesitemmodel.cpp @@ -435,8 +435,9 @@ void PlacesItemModel::dropMimeDataBefore(int index, const QMimeData* mimeData) text = url.host(); } - if (url.isLocalFile() && !QFileInfo(url.toLocalFile()).isDir()) { - // Only directories are allowed + if ((url.isLocalFile() && !QFileInfo(url.toLocalFile()).isDir()) + || url.protocol() == "trash") { + // Only directories outside the trash are allowed continue; } |