wilderjds
/
plasma-workspace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix build after moving kcm in plasma-workspace

Browse Source 
It tried using notificationmanager includes installed by
plasma-workspace itself, that can not work when it is in same repo.
wilder-5.22
Bhushan Shah 5 years ago committed by Bhushan Shah
parent 9bb6ce7e8e
commit 5226173795
3 changed files with 11 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      kcms/notifications/kcm.cpp
  2. 10
      kcms/notifications/notificationsdata.cpp
  3. 2
      libnotificationmanager/CMakeLists.txt

10
kcms/notifications/kcm.cpp
Unescape View File

@ -45,11 +45,11 @@
#include "notificationsdata.h"
#include "sourcesmodel.h"
#include <notificationmanager/badgesettings.h>
#include <notificationmanager/behaviorsettings.h>
#include <notificationmanager/donotdisturbsettings.h>
#include <notificationmanager/jobsettings.h>
#include <notificationmanager/notificationsettings.h>
#include <libnotificationmanager/badgesettings.h>
#include <libnotificationmanager/behaviorsettings.h>
#include <libnotificationmanager/donotdisturbsettings.h>
#include <libnotificationmanager/jobsettings.h>
#include <libnotificationmanager/notificationsettings.h>
K_PLUGIN_FACTORY_WITH_JSON(KCMNotificationsFactory, "kcm_notifications.json", registerPlugin<KCMNotifications>(); registerPlugin<NotificationsData>();)

10
kcms/notifications/notificationsdata.cpp
Unescape View File

@ -20,11 +20,11 @@
#include "notificationsdata.h"
#include <notificationmanager/badgesettings.h>
#include <notificationmanager/behaviorsettings.h>
#include <notificationmanager/donotdisturbsettings.h>
#include <notificationmanager/jobsettings.h>
#include <notificationmanager/notificationsettings.h>
#include <libnotificationmanager/badgesettings.h>
#include <libnotificationmanager/behaviorsettings.h>
#include <libnotificationmanager/donotdisturbsettings.h>
#include <libnotificationmanager/jobsettings.h>
#include <libnotificationmanager/notificationsettings.h>
NotificationsData::NotificationsData(QObject *parent, const QVariantList &args)
: KCModuleData(parent, args)

2
libnotificationmanager/CMakeLists.txt
Unescape View File

@ -70,7 +70,7 @@ target_compile_definitions(notificationmanager PRIVATE -DPROJECT_VERSION="${PROJ
generate_export_header(notificationmanager)
target_include_directories(notificationmanager PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>" "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/notificationmanager>")
target_include_directories(notificationmanager PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>" "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/notificationmanager>")
target_link_libraries(notificationmanager
PUBLIC

Write Preview
Loading…
Cancel
Save