ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix notifications on Android

Browse Source 
Bundle the notifyrc file in qrc so that KNotifications finds it
This commit is contained in:
Nicolas Fella
2021-12-22 15:13:48 +01:00
committed by Carl Schwan
parent d71ccc46d0
commit 5e1adf7ea7
5 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.reuse/dep5
View File

@@ -35,7 +35,7 @@ Copyright: 2020-2021 Carl Schwan <carlschwan@kde.org>
Copyright: 2020-2021 Tobias Fella <fella@posteo.de> Copyright: 2020-2021 Tobias Fella <fella@posteo.de>
License: BSD-2-Clause License: BSD-2-Clause
Files: neochat.notifyrc Files: src/neochat.notifyrc
Copyright: 2020 Tobias Fella <fella@posteo.de> Copyright: 2020 Tobias Fella <fella@posteo.de>
License: BSD-2-Clause License: BSD-2-Clause

1
CMakeLists.txt
View File

@@ -126,7 +126,6 @@ install(FILES org.kde.neochat-symbolic.svg DESTINATION ${KDE_INSTALL_FULL_ICONDI
install(FILES org.kde.neochat-symbolic.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/16x16@2/apps RENAME org.kde.neochat.svg) install(FILES org.kde.neochat-symbolic.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/16x16@2/apps RENAME org.kde.neochat.svg)
install(FILES org.kde.neochat-symbolic.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/16x16@3/apps RENAME org.kde.neochat.svg) install(FILES org.kde.neochat-symbolic.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/16x16@3/apps RENAME org.kde.neochat.svg)
install(FILES org.kde.neochat-symbolic.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/symbolic/apps) install(FILES org.kde.neochat-symbolic.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/symbolic/apps)
install(FILES neochat.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})
add_definitions(-DQT_NO_FOREACH) add_definitions(-DQT_NO_FOREACH)

2
src/CMakeLists.txt
View File

@@ -70,6 +70,7 @@ if(NEOCHAT_FLATPAK)
endif() endif()
if(ANDROID) if(ANDROID)
target_sources(neochat PRIVATE notifyrc.qrc)
target_link_libraries(neochat PRIVATE Qt5::Svg OpenSSL::SSL) target_link_libraries(neochat PRIVATE Qt5::Svg OpenSSL::SSL)
kirigami_package_breeze_icons(ICONS kirigami_package_breeze_icons(ICONS
"arrow-down" "arrow-down"
@@ -113,6 +114,7 @@ if(ANDROID)
) )
else() else()
target_link_libraries(neochat PRIVATE Qt5::Widgets KF5::KIOWidgets) target_link_libraries(neochat PRIVATE Qt5::Widgets KF5::KIOWidgets)
install(FILES neochat.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})
endif() endif()
if(TARGET KF5::DBusAddons) if(TARGET KF5::DBusAddons)

0
neochat.notifyrc → src/neochat.notifyrc
View File

9
src/notifyrc.qrc Normal file
View File

@@ -0,0 +1,9 @@
<!--
SPDX-FileCopyrightText: None
SPDX-License-Identifier: CC0-1.0
-->
<RCC>
<qresource prefix="/knotifications5">
<file>neochat.notifyrc</file>
</qresource>
</RCC>