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
Education
KBruch
Commits
b52714f6
Commit
b52714f6
authored
Jan 06, 2022
by
Laurent Montel
😁
Browse files
Fix qt6 support
parent
62333faf
Pipeline
#119822
passed with stage
in 46 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
b52714f6
...
...
@@ -9,7 +9,7 @@ set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_
project
(
kbruch VERSION
${
RELEASE_SERVICE_VERSION
}
)
set
(
QT_MIN_VERSION
"5.15.0"
)
set
(
KF5_MIN_VERSION
"5.
85
.0"
)
set
(
KF5_MIN_VERSION
"5.
90
.0"
)
find_package
(
ECM
${
KF5_MIN_VERSION
}
REQUIRED NO_MODULE
)
set
(
CMAKE_MODULE_PATH
${
ECM_MODULE_PATH
}
)
...
...
@@ -23,7 +23,7 @@ include(ECMSetupVersion)
include
(
ECMInstallIcons
)
include
(
FeatureSummary
)
find_package
(
Qt
5
${
QT_MIN_VERSION
}
CONFIG REQUIRED
find_package
(
Qt
${
QT_MAJOR_VERSION
}
${
QT_MIN_VERSION
}
CONFIG REQUIRED
Core
Widgets
)
...
...
@@ -31,7 +31,6 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED
find_package
(
KF5
${
KF5_MIN_VERSION
}
REQUIRED
Config
Crash
DocTools
I18n
WidgetsAddons
XmlGui
...
...
src/CMakeLists.txt
View file @
b52714f6
...
...
@@ -53,8 +53,8 @@ install(TARGETS kbruch ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
install
(
PROGRAMS org.kde.kbruch.desktop DESTINATION
${
KDE_INSTALL_APPDIR
}
)
install
(
FILES kbruch.kcfg DESTINATION
${
KDE_INSTALL_KCFGDIR
}
)
install
(
FILES kbruchui.rc DESTINATION
${
KDE_INSTALL_KXMLGUI
5
DIR
}
/kbruch
)
install
(
FILES AppMenuWidgetui.rc DESTINATION
${
KDE_INSTALL_KXMLGUI
5
DIR
}
/kbruch
)
install
(
FILES FractionRingWidgetui.rc DESTINATION
${
KDE_INSTALL_KXMLGUI
5
DIR
}
/kbruch
)
install
(
FILES kbruchui.rc DESTINATION
${
KDE_INSTALL_KXMLGUIDIR
}
/kbruch
)
install
(
FILES AppMenuWidgetui.rc DESTINATION
${
KDE_INSTALL_KXMLGUIDIR
}
/kbruch
)
install
(
FILES FractionRingWidgetui.rc DESTINATION
${
KDE_INSTALL_KXMLGUIDIR
}
/kbruch
)
ecm_install_icons
(
ICONS 16-apps-kbruch.png 22-apps-kbruch.png 32-apps-kbruch.png 48-apps-kbruch.png 64-apps-kbruch.png sc-apps-kbruch.svgz DESTINATION
${
KDE_INSTALL_ICONDIR
}
THEME hicolor
)
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