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
Accessibility
KMouth
Commits
c65b637f
Commit
c65b637f
authored
Aug 31, 2021
by
Laurent Montel
😁
Browse files
Port some deprecated methods
parent
fe2a9a4e
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
c65b637f
...
...
@@ -11,7 +11,7 @@ endif(NOT MSVC)
include
(
FeatureSummary
)
set
(
QT_MIN_VERSION
"5.15.0"
)
set
(
KF5_MIN_VERSION
"5.8
3
.0"
)
set
(
KF5_MIN_VERSION
"5.8
5
.0"
)
find_package
(
Qt5
${
QT_MIN_VERSION
}
REQUIRED COMPONENTS Core PrintSupport TextToSpeech Xml Widgets
)
...
...
@@ -39,6 +39,12 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
XmlGui
)
include_directories
(
${
CMAKE_CURRENT_SOURCE_DIR
}
${
CMAKE_CURRENT_BINARY_DIR
}
)
add_definitions
(
#-DQT_DISABLE_DEPRECATED_BEFORE=0x050F00
-DQT_DEPRECATED_WARNINGS_SINCE=0x060000
-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055600
-DKF_DEPRECATED_WARNINGS_SINCE=0x060000
)
add_subdirectory
(
doc
)
add_subdirectory
(
icons
)
...
...
phrasebook/phrasebook.cpp
View file @
c65b637f
...
...
@@ -452,7 +452,7 @@ void PhraseBook::addToGUI(QMenu *popup, KToolBar *toolbar, KActionCollection *ph
int
newLevel
=
(
*
it
).
getLevel
();
while
(
newLevel
>
level
)
{
KActionMenu
*
menu
=
phrases
->
add
<
KActionMenu
>
(
QStringLiteral
(
"phrasebook"
));
menu
->
set
Delayed
(
false
);
menu
->
set
PopupMode
(
QToolButton
::
InstantPopup
);
if
(
parent
==
popup
)
toolbar
->
addAction
(
menu
);
if
(
parent
!=
nullptr
)
{
...
...
@@ -478,7 +478,7 @@ void PhraseBook::addToGUI(QMenu *popup, KToolBar *toolbar, KActionCollection *ph
Phrase
phrase
=
(
*
it
).
getPhrase
();
KActionMenu
*
menu
=
phrases
->
add
<
KActionMenu
>
(
QStringLiteral
(
"phrasebook"
));
menu
->
setText
(
phrase
.
getPhrase
());
menu
->
set
Delayed
(
false
);
menu
->
set
PopupMode
(
QToolButton
::
InstantPopup
);
if
(
parent
==
popup
)
toolbar
->
addAction
(
menu
);
parent
->
addAction
(
menu
);
...
...
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