[Okular-devel] Review Request 127628: [WIP] building against Qt 5

[René J.V. Bertin]

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

Review request for KDE Graphics and Okular.


Repository: kdegraphics-mobipocket


Description
-------

I didn't pay attention for a split second, wondered how the KF5 Okular version could use a Qt4-based libqmobipocket and instead of checking (and seeing the corresponding module isn't built ATM) I thought I'd try and build at least libqmobipocket against Qt 5.

The result is the attached patch. Very much a work in progress, but since no effort has yet been made to port this particular package to KF5 I thought I'd share.

I've tried to ensure that the Qt4/KDE4 and Qt5(/KF5) versions can be coinstalled under the assumption that the KDE4 header files are not installed under ${prefix}/include (but e.g. under ${prefix}/include/KDE4 like on my system). That can be achieved easily enough by configuring kdelibs4 with `-DINCLUDE_INSTALL_DIR=${prefix}/include/KDE4`).

I'm not sure why the `STRIGI_FOUND` token isn't defined in my `TARGET_QT5` cmake code path, but found a workaround which suffices for a proof-of-concept implementation.

It will probably be relatively trivial to port the thumbnailer component too but my not-so-rainy sunday afternoon is now over (IOW, I'll let myself be beaten to it happily).


Diffs
-----

  CMakeLists.txt ea2e644 
  QMobipocket5Config.cmake PRE-CREATION 
  QMobipocketConfig.cmake d615afc 
  lib/CMakeLists.txt 90fc229 
  lib/mobipocket.cpp 5b731b4 
  lib/qmobipocket_export.h 923134a 
  strigi/CMakeLists.txt 895284f 

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


Testing
-------

It builds against Qt 5.6.0 on OS X and Linux.


Thanks,

René J.V. Bertin

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