diff --git a/CMakeLists.txt b/CMakeLists.txt index 18b2f33..ee3ccfd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,6 +38,7 @@ else() if(WITH_QT4) find_package(Qt4 REQUIRED) else() + find_package(ECM 0.0.9 NO_MODULE) find_package(Qt5Core REQUIRED) find_package(Qt5Widgets REQUIRED) find_package(Qt5Network REQUIRED) @@ -48,7 +49,12 @@ else() set(SNORE_CamelCase_SUFFIX "Qt5") endif() 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() diff --git a/src/plugins/backends/snarl/SnarlInterface.cpp b/src/plugins/backends/snarl/SnarlInterface.cpp index 2407fc8..a3b3557 100644 --- a/src/plugins/backends/snarl/SnarlInterface.cpp +++ b/src/plugins/backends/snarl/SnarlInterface.cpp @@ -45,8 +45,9 @@ /// /// - +#ifndef _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS +#endif #include "SnarlInterface.h" diff --git a/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.cpp b/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.cpp index 7d94b22..eede9d0 100644 --- a/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.cpp +++ b/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.cpp @@ -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 QStringList &actions, const QVariantMap &hints, int timeout) { + Q_UNUSED(app_icon); Icon icon; Application app; Notification::Prioritys priotity = Notification::NORMAL; diff --git a/thirdparty/gntp-send b/thirdparty/gntp-send index 20a62e3..0239846 160000 --- a/thirdparty/gntp-send +++ b/thirdparty/gntp-send @@ -1 +1 @@ -Subproject commit 20a62e3dabd121a8ecd73cabad446c13357d8b93 +Subproject commit 02398466d3a1fa80f99fee63606239eed009a1c8