[Okular-devel] Review Request 122155: Use co-installable qca-qt5 version

[Heiko Becker]

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

Review request for Okular.


Repository: okular


Description
-------

If both qt4 and qt5 versions of qca are present the build of the
frameworks branch tries to find Qt4 pulled in by qca and thus fails.


This is similiar to what has been done to konversation and muon
http://quickgit.kde.org/?p=konversation.git&a=commit&h=3aa918b5e3ac0f90a76d55c2bab12fafcbb1279b
http://quickgit.kde.org/?p=muon.git&a=commit&h=fd76f5ad43228689127cb4f12c0fbc6d65f4b373

Note: I don't have commit access so I'd need someone to push this for me.


Diffs
-----

  generators/ooo/CMakeLists.txt 61054bd8f01af0ac5bee42c58f46f54b2f560f92 

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


Testing
-------

Successfully built with -DCMAKE_DISABLE_FIND_PACKAGE_Qca-qt5:BOOL=FALSE AND TRUE and okular linked to the right version of qca in the former case.


Thanks,

Heiko Becker

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