diff options
| author | Luca Beltrame <[email protected]> | 2014-09-21 14:36:15 +0200 |
|---|---|---|
| committer | Luca Beltrame <[email protected]> | 2014-09-21 14:36:15 +0200 |
| commit | 2744fb4a0b70cdff98c4f7e857247828cffe791e (patch) | |
| tree | 0f33c9ddb7c6141f7071e3f844b75653c48190fa /src | |
| parent | ab3ea08625648cf1f9f00cc9bcda5e06d2b8ffa9 (diff) | |
| parent | 4479a546bda708cad514412e8cf749c11caa0697 (diff) | |
Merge branch 'master' into frameworks
Diffstat (limited to 'src')
| -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 8eb79a8a8..d59d0b03a 100644 --- a/src/panels/places/placesitemmodel.cpp +++ b/src/panels/places/placesitemmodel.cpp @@ -433,8 +433,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; } |