diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-13 14:25:18 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-13 15:07:41 +0200 |
commit | 1582407fc782c0befd0760633324dd5c206524a1 (patch) | |
tree | e993d66e824da41ece006d44c48acd4df0ba749e /src/gui/kernel/qdnd.cpp | |
parent | 30cb91e17d2fbbdce90f7542f44e12af971ba2de (diff) |
Remove Q_WS_ and Q_OS_SYMBIAN from QtGui.
Change-Id: I2ac3376513c3fbfc81a2e695a73a0d948d2696bc
Reviewed-on: http://codereview.qt-project.org/6607
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/gui/kernel/qdnd.cpp')
-rw-r--r-- | src/gui/kernel/qdnd.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/gui/kernel/qdnd.cpp b/src/gui/kernel/qdnd.cpp index de255b9cc5..6cf986ff66 100644 --- a/src/gui/kernel/qdnd.cpp +++ b/src/gui/kernel/qdnd.cpp @@ -132,18 +132,12 @@ QDragManager::QDragManager() { Q_ASSERT(!instance); -#ifdef Q_WS_QWS - currentActionForOverrideCursor = Qt::IgnoreAction; -#endif object = 0; beingCancelled = false; restoreCursor = false; willDrop = false; eventLoop = 0; currentDropTarget = 0; -#ifdef Q_WS_X11 - xdndMimeTransferedPixmapIndex = 0; -#endif shapedPixmapWindow = 0; possible_actions = Qt::IgnoreAction; @@ -211,21 +205,9 @@ Qt::DropAction QDragManager::defaultAction(Qt::DropActions possibleActions, if (defaultAction == Qt::IgnoreAction) { //This means that the drag was initiated by QDrag::start and we need to //preserve the old behavior -#ifdef Q_WS_MAC - defaultAction = Qt::MoveAction; -#else defaultAction = Qt::CopyAction; -#endif } -#ifdef Q_WS_MAC - if (modifiers & Qt::ControlModifier && modifiers & Qt::AltModifier) - defaultAction = Qt::LinkAction; - else if (modifiers & Qt::AltModifier) - defaultAction = Qt::CopyAction; - else if (modifiers & Qt::ControlModifier) - defaultAction = Qt::MoveAction; -#else if (modifiers & Qt::ControlModifier && modifiers & Qt::ShiftModifier) defaultAction = Qt::LinkAction; else if (modifiers & Qt::ControlModifier) @@ -234,7 +216,6 @@ Qt::DropAction QDragManager::defaultAction(Qt::DropActions possibleActions, defaultAction = Qt::MoveAction; else if (modifiers & Qt::AltModifier) defaultAction = Qt::LinkAction; -#endif #ifdef QDND_DEBUG qDebug("possible actions : %s", dragActionsToString(possibleActions).latin1()); |