Merge branch 'master' into frameworks

This commit is contained in:
Luca Beltrame 2014-09-21 14:36:15 +02:00
commit 2744fb4a0b

View file

@ -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;
}