Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Education
Marble
Commits
b828ce3f
Commit
b828ce3f
authored
Aug 31, 2020
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Port away from deprecated Qt::MidButton
parent
06da643b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
src/lib/marble/MarbleInputHandler.cpp
src/lib/marble/MarbleInputHandler.cpp
+3
-3
src/lib/marble/MarbleLineEdit.cpp
src/lib/marble/MarbleLineEdit.cpp
+1
-1
No files found.
src/lib/marble/MarbleInputHandler.cpp
View file @
b828ce3f
...
...
@@ -464,7 +464,7 @@ void MarbleDefaultInputHandler::checkReleasedMove(QMouseEvent *event)
}
}
}
if
(
event
->
type
()
==
QEvent
::
MouseMove
&&
!
(
event
->
buttons
()
&
Qt
::
MidButton
))
if
(
event
->
type
()
==
QEvent
::
MouseMove
&&
!
(
event
->
buttons
()
&
Qt
::
Mid
dle
Button
))
{
d
->
m_midPressed
=
false
;
}
...
...
@@ -478,7 +478,7 @@ void MarbleDefaultInputHandler::handleMouseButtonPress(QMouseEvent *event)
handleLeftMouseButtonPress
(
event
);
}
if
(
event
->
button
()
==
Qt
::
MidButton
)
if
(
event
->
button
()
==
Qt
::
Mid
dle
Button
)
{
handleMiddleMouseButtonPress
(
event
);
}
...
...
@@ -582,7 +582,7 @@ void MarbleDefaultInputHandler::handleMouseButtonRelease(QMouseEvent *event)
}
}
if
(
event
->
button
()
==
Qt
::
MidButton
)
if
(
event
->
button
()
==
Qt
::
Mid
dle
Button
)
{
d
->
m_midPressed
=
false
;
...
...
src/lib/marble/MarbleLineEdit.cpp
View file @
b828ce3f
...
...
@@ -182,7 +182,7 @@ void MarbleLineEdit::mouseReleaseEvent( QMouseEvent* e )
{
if
(
d
->
m_clearButton
==
childAt
(
e
->
pos
()
)
)
{
QString
newText
;
if
(
e
->
button
()
==
Qt
::
MidButton
)
{
if
(
e
->
button
()
==
Qt
::
Mid
dle
Button
)
{
newText
=
QApplication
::
clipboard
()
->
text
(
QClipboard
::
Selection
);
setText
(
newText
);
}
else
{
...
...
Write
Preview
Markdown
is supported
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