Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Plasma
Oxygen
Commits
bf30d178
Commit
bf30d178
authored
Dec 10, 2020
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
operator+/- is disabled for QFlags in qt6
parent
c74576e2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
kstyle/demo/oxygendemodialog.cpp
kstyle/demo/oxygendemodialog.cpp
+1
-1
kstyle/demo/oxygenmdidemowidget.cpp
kstyle/demo/oxygenmdidemowidget.cpp
+2
-2
No files found.
kstyle/demo/oxygendemodialog.cpp
View file @
bf30d178
...
...
@@ -180,7 +180,7 @@ namespace Oxygen
}
// connections
QShortcut
*
shortcut
(
new
QShortcut
(
Qt
::
CTRL
+
Qt
::
Key_X
,
this
)
);
QShortcut
*
shortcut
(
new
QShortcut
(
Qt
::
CTRL
|
Qt
::
Key_X
,
this
)
);
for
(
auto
item
:
items
)
{
if
(
item
->
widget
()
->
metaObject
()
->
indexOfSlot
(
"benchmark()"
)
>=
0
)
...
...
kstyle/demo/oxygenmdidemowidget.cpp
View file @
bf30d178
...
...
@@ -59,11 +59,11 @@ namespace Oxygen
menu
=
menuBar
->
addMenu
(
i18n
(
"Tools"
)
);
QAction
*
action
;
connect
(
action
=
menu
->
addAction
(
QIcon
::
fromTheme
(
QStringLiteral
(
"arrow-right"
)
),
i18n
(
"Select Next Window"
)
),
SIGNAL
(
triggered
()),
ui
.
mdiArea
,
SLOT
(
activateNextSubWindow
())
);
action
->
setShortcut
(
Qt
::
CTRL
+
Qt
::
Key_Tab
);
action
->
setShortcut
(
Qt
::
CTRL
|
Qt
::
Key_Tab
);
addAction
(
action
);
connect
(
action
=
menu
->
addAction
(
QIcon
::
fromTheme
(
QStringLiteral
(
"arrow-left"
)
),
i18n
(
"Select Previous Window"
)
),
SIGNAL
(
triggered
()),
ui
.
mdiArea
,
SLOT
(
activatePreviousSubWindow
())
);
action
->
setShortcut
(
Qt
::
CTRL
+
Qt
::
SHIFT
+
Qt
::
Key_Tab
);
action
->
setShortcut
(
Qt
::
CTRL
|
Qt
::
SHIFT
|
Qt
::
Key_Tab
);
addAction
(
action
);
}
...
...
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