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
Kleopatra
Commits
5818c059
Commit
5818c059
authored
Nov 16, 2020
by
Laurent Montel
😁
Browse files
Make it compile without deprecated method
parent
afac8e79
Pipeline
#41229
canceled with stage
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
5818c059
...
...
@@ -139,7 +139,7 @@ include_directories(
add_definitions
(
-D_ASSUAN_ONLY_GPG_ERRORS
)
#add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00)
add_definitions
(
-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054
C
00
)
add_definitions
(
-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054
D
00
)
if
(
CMAKE_COMPILER_IS_GNUCXX
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wno-missing-braces -Wno-parentheses -Wno-ignored-qualifiers"
)
endif
()
...
...
src/mainwindow.cpp
View file @
5818c059
...
...
@@ -8,7 +8,7 @@
*/
#include
<config-kleopatra.h>
#include
<kwidgetsaddons_version.h>
#include
"mainwindow.h"
#include
"aboutdata.h"
...
...
@@ -465,7 +465,11 @@ void MainWindow::Private::setupActions()
clipboadMenu
=
new
ClipboardMenu
(
q
);
clipboadMenu
->
setMainWindow
(
q
);
clipboadMenu
->
clipboardMenu
()
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"edit-paste"
)));
#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 77, 0)
clipboadMenu
->
clipboardMenu
()
->
setPopupMode
(
QToolButton
::
InstantPopup
);
#else
clipboadMenu
->
clipboardMenu
()
->
setDelayed
(
false
);
#endif
coll
->
addAction
(
QStringLiteral
(
"clipboard_menu"
),
clipboadMenu
->
clipboardMenu
());
q
->
setStandardToolBarMenuEnabled
(
true
);
...
...
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