[Okular-devel] Review Request 123249: Fixing the KActivities integration (Frameworks branch)

[Ivan Čukić]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/123249/
-----------------------------------------------------------

(Updated May 4, 2015, 10:21 p.m.)


Status
------

This change has been marked as submitted.


Review request for Okular and Albert Astals Cid.


Changes
-------

Submitted with commit c46b08c23f12f9819e93bd67b7147b1964cd7e8a by Ivan ?uki? to branch frameworks.


Repository: okular


Description
-------

Since the a3fb02b881d commit, the KF5::Activities are a required dependency (CMakeLists.txt:31).

Still, the actual code uses ifdefs for KActivities_FOUND macro which no longer exists. This patch removes the macros and restores the feature.


Diffs
-----

  autotests/CMakeLists.txt 0a0f546 
  shell/CMakeLists.txt ec36582 
  shell/shell.h f345cf3 
  shell/shell.cpp 6bb89c5 

Diff: https://git.reviewboard.kde.org/r/123249/diff/


Testing
-------


Thanks,

Ivan Čukić

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/okular-devel/attachments/20150504/c49ef090/attachment.html>