diff options
| author | Frank Reininghaus <[email protected]> | 2012-11-25 12:05:53 +0100 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2012-11-25 12:05:53 +0100 |
| commit | ffe179ad51d1f88f98e03fc130ec85b306a018d8 (patch) | |
| tree | 4b37844dd421e5ba606a0c94fb9f4b262d96beae /src | |
| parent | 06e5202c4727df7295fc7a515e41f65a9c2fcdde (diff) | |
| parent | c570c6203650b20800c07d0f45b9a808758e923e (diff) | |
Merge remote-tracking branch 'origin/KDE/4.9'
Diffstat (limited to 'src')
| -rw-r--r-- | src/kitemviews/private/kfileitemclipboard.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/kitemviews/private/kfileitemclipboard.cpp b/src/kitemviews/private/kfileitemclipboard.cpp index c5f88194d..faace2a3a 100644 --- a/src/kitemviews/private/kfileitemclipboard.cpp +++ b/src/kitemviews/private/kfileitemclipboard.cpp @@ -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(); } |
