Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Utilities
KEditBookmarks
Commits
a087de28
Commit
a087de28
authored
Dec 24, 2021
by
Laurent Montel
Browse files
Adapt build system for building against qt6
parent
06a013de
Pipeline
#113846
passed with stage
in 1 minute and 5 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
a087de28
...
...
@@ -9,7 +9,7 @@ set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_
project
(
keditbookmarks VERSION
${
RELEASE_SERVICE_VERSION
}
)
# ECM setup
set
(
KF5_MIN_VERSION
"5.8
5
.0"
)
set
(
KF5_MIN_VERSION
"5.8
9
.0"
)
find_package
(
ECM
${
KF5_MIN_VERSION
}
CONFIG REQUIRED
)
set
(
CMAKE_MODULE_PATH
${
ECM_MODULE_PATH
}
)
...
...
@@ -32,7 +32,10 @@ kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
set
(
KEDITBOOKMARKS_VERSION
"5.97.0"
)
find_package
(
Qt5
${
QT_MIN_VERSION
}
REQUIRED COMPONENTS Core
)
find_package
(
Qt
${
QT_MAJOR_VERSION
}
${
QT_MIN_VERSION
}
REQUIRED COMPONENTS Core
)
if
(
QT_MAJOR_VERSION STREQUAL
"6"
)
find_package
(
Qt6Core5Compat
)
endif
()
find_package
(
KF5
${
KF5_MIN_VERSION
}
REQUIRED COMPONENTS CoreAddons I18n KIO Bookmarks Parts WindowSystem IconThemes
)
find_package
(
KF5DocTools
${
KF5_MIN_VERSION
}
)
set_package_properties
(
KF5DocTools PROPERTIES DESCRIPTION
...
...
@@ -40,14 +43,13 @@ set_package_properties(KF5DocTools PROPERTIES DESCRIPTION
TYPE OPTIONAL
)
if
(
BUILD_TESTING
)
find_package
(
Qt
5
Test
${
QT_REQUIRED_VERSION
}
CONFIG REQUIRED
)
find_package
(
Qt
${
QT_MAJOR_VERSION
}
Test
${
QT_REQUIRED_VERSION
}
CONFIG REQUIRED
)
endif
()
add_definitions
(
-DQT_DISABLE_DEPRECATED_BEFORE=0x050F02
-DQT_DEPRECATED_WARNINGS_SINCE=0x060000
-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055500
-DKNOTIFICATIONS_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054E00
# KPassivePopup
-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055800
-DKF_DEPRECATED_WARNINGS_SINCE=0x060000
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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