status-im
/
snorenotify
mirror of https://github.com/status-im/snorenotify.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

start kf5 support

This commit is contained in:
Patrick von Reth 2014-08-11 14:18:49 +02:00
parent 6c8a3e294c
commit 07e1e0a94c
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -38,6 +38,7 @@ else()
if(WITH_QT4) if(WITH_QT4)
find_package(Qt4 REQUIRED) find_package(Qt4 REQUIRED)
else() else()
find_package(ECM 0.0.9 NO_MODULE)
find_package(Qt5Core REQUIRED) find_package(Qt5Core REQUIRED)
find_package(Qt5Widgets REQUIRED) find_package(Qt5Widgets REQUIRED)
find_package(Qt5Network REQUIRED) find_package(Qt5Network REQUIRED)
@ -48,7 +49,12 @@ else()
set(SNORE_CamelCase_SUFFIX "Qt5") set(SNORE_CamelCase_SUFFIX "Qt5")
endif() endif()
include_directories( ${QT_INCLUDES} ) include_directories( ${QT_INCLUDES} )
include(NoKDE) if(NOT ECM_FOUND)
include(NoKDE)
else()
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
include(KDECompilerSettings)
endif()
endif() endif()

3
src/plugins/backends/snarl/SnarlInterface.cpp
View File

@ -45,8 +45,9 @@
/// <Todo> /// <Todo>
/// </Todo> /// </Todo>
#ifndef _CRT_SECURE_NO_WARNINGS
#define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS
#endif
#include "SnarlInterface.h" #include "SnarlInterface.h"

1
src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.cpp
View File

@ -91,6 +91,7 @@ uint FreedesktopFrontend::Notify(const QString &app_name, uint replaces_id,
const QString &app_icon, const QString &summary, const QString &body, const QString &app_icon, const QString &summary, const QString &body,
const QStringList &actions, const QVariantMap &hints, int timeout) const QStringList &actions, const QVariantMap &hints, int timeout)
{ {
Q_UNUSED(app_icon);
Icon icon; Icon icon;
Application app; Application app;
Notification::Prioritys priotity = Notification::NORMAL; Notification::Prioritys priotity = Notification::NORMAL;

2
thirdparty/gntp-send vendored

@ -1 +1 @@
Subproject commit 20a62e3dabd121a8ecd73cabad446c13357d8b93 Subproject commit 02398466d3a1fa80f99fee63606239eed009a1c8