Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
Akonadi
Commits
3120ea30
Commit
3120ea30
authored
Jan 22, 2021
by
Laurent Montel
😁
Browse files
Merge remote-tracking branch 'origin/release/20.12'
parents
1565bb57
6cfce924
Pipeline
#48315
passed with stage
in 13 minutes and 3 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/widgets/dragdropmanager.cpp
View file @
3120ea30
...
...
@@ -233,7 +233,7 @@ bool DragDropManager::processDropEvent(QDropEvent *event, bool &menuCanceled, bo
popup
.
addSeparator
();
popup
.
addAction
(
QIcon
::
fromTheme
(
QStringLiteral
(
"process-stop"
)),
i18n
(
"C&ancel"
)
+
QLatin1Char
(
'\t'
)
+
QKeySequence
(
Qt
::
Key_Escape
).
toString
());
QAction
*
activatedAction
=
popup
.
exec
(
QCursor
::
pos
());
QAction
*
activatedAction
=
popup
.
exec
(
m_view
->
mapToGlobal
(
event
->
pos
())
)
;
if
(
activatedAction
==
moveDropAction
)
{
event
->
setDropAction
(
Qt
::
MoveAction
);
}
else
if
(
activatedAction
==
copyDropAction
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment