[vlc-commits] Qt4: Playlists: Fixing drop.

Hugo Beauzée-Luyssen git at videolan.org
Fri Dec 2 00:24:12 CET 2011


vlc/vlc-1.2 | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Tue Nov 29 23:32:41 2011 +0100| [49c7c8cc9d8e8525bd5cc2d513cb18f46af88ffd] | committer: Jean-Baptiste Kempf

Qt4: Playlists: Fixing drop.

KDE sends a move event by default, unless ctrl is pressed

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 71e8745a8aad584c6e5fa1917ef8100a6b404c87)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=49c7c8cc9d8e8525bd5cc2d513cb18f46af88ffd
---

 modules/gui/qt4/main_interface.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 13fda87..2a3a8f1 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -1186,7 +1186,7 @@ void MainInterface::dropEvent(QDropEvent *event)
 
 void MainInterface::dropEventPlay( QDropEvent *event, bool b_play )
 {
-    if( event->possibleActions() & Qt::CopyAction )
+    if( event->possibleActions() & ( Qt::CopyAction | Qt::MoveAction ) )
        event->setDropAction( Qt::CopyAction );
     else
         return;



More information about the vlc-commits mailing list