Merge remote-tracking branch 'origin/KDE/4.9'

This commit is contained in:
Frank Reininghaus 2012-11-25 12:05:53 +01:00
commit ffe179ad51

View file

@ -55,7 +55,13 @@ KFileItemClipboard::~KFileItemClipboard()
void KFileItemClipboard::updateCutItems()
{
const QMimeData* mimeData = QApplication::clipboard()->mimeData();
m_cutItems = KUrl::List::fromMimeData(mimeData).toSet();
const QByteArray data = mimeData->data("application/x-kde-cutselection");
const bool isCutSelection = (!data.isEmpty() && data.at(0) == QLatin1Char('1'));
if (isCutSelection) {
m_cutItems = KUrl::List::fromMimeData(mimeData).toSet();
} else {
m_cutItems.clear();
}
emit cutItemsChanged();
}