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
PIM
KAlarm
Commits
7a667261
Commit
7a667261
authored
Feb 22, 2022
by
Laurent Montel
Browse files
Fix some compile error against qt6
parent
62d5c624
Pipeline
#140974
passed with stage
in 2 minutes and 56 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
7a667261
...
...
@@ -111,7 +111,11 @@ if (NOT APPLE)
find_package
(
X11
)
endif
()
if
(
X11_FOUND
)
find_package
(
Qt
${
QT_MAJOR_VERSION
}
X11Extras
${
QT_REQUIRED_VERSION
}
REQUIRED NO_MODULE
)
if
(
QT_MAJOR_VERSION STREQUAL
"5"
)
find_package
(
Qt5X11Extras
${
QT_REQUIRED_VERSION
}
REQUIRED NO_MODULE
)
else
()
#TODO
endif
()
endif
()
set
(
CMAKE_MODULE_PATH
${
ECM_MODULE_PATH
}
)
...
...
src/CMakeLists.txt
View file @
7a667261
...
...
@@ -315,7 +315,7 @@ install(FILES data/org.kde.kalarm.appdata.xml DESTINATION ${KDE_INSTALL_METAINFO
install
(
FILES data/kalarmconfig.kcfg DESTINATION
${
KDE_INSTALL_KCFGDIR
}
)
install
(
FILES data/kalarmui.rc DESTINATION
${
KDE_INSTALL_KXMLGUIDIR
}
/kalarm
)
install
(
FILES data/org.kde.kalarm.kalarm.xml DESTINATION
${
KDE_INSTALL_DBUSINTERFACEDIR
}
)
install
(
FILES data/kalarm.notifyrc DESTINATION
${
KDE_INSTALL_KNOTIFY
5
RCDIR
}
)
install
(
FILES data/kalarm.notifyrc DESTINATION
${
KDE_INSTALL_KNOTIFYRCDIR
}
)
########### KAuth helper ###############
...
...
src/rtcwakeaction.h
View file @
7a667261
...
...
@@ -5,10 +5,13 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*/
#include
<QObject>
#pragma once
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include
<KAuth>
#else
#include
<KAuth/KAuth>
#endif
using
namespace
KAuth
;
...
...
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