Review Request: Remove KDE_NO_PHONON hackery

[Jon Severinsson]

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

(Updated Nov. 23, 2012, 4:54 p.m.)


Review request for KDE Frameworks.


Changes
-------

Cleaned up knotify/config/CMakeLists.txt a bit


Description
-------

    Previously the Phonon headers and library was always required to build,
    but when building with Qt5 the build system made sure never to link
    against the library. Thus the build would work (with some missing
    features) even if the only available phonon was built with Qt4. (Which
    was the only possibility, as Phonon previously didn't build with Qt5).
    
    With this patch, the Phonon headers and library is optional to build,
    but if they are found they will be used. Thus building with Qt5 and a
    Phonon built with Qt4 will no longer work. However, this patch allows
    building with Phonon on Qt5, provided Phonon was built with Qt5.
    
    In other words, these combinations are now supported (* are new with this patch):
    Qt4, No Phonon*
    Qt4, Phonon 4 on Qt4
    Qt4, Phonon 5 on Qt4
    Qt5, No Phonon*
    Qt5, Phonon 5 on Qt5*
    
    While these combinations are not supported (* previously (sort of) worked):
    Qt4, Phonon 4 on Qt5
    Qt4, Phonon 5 on Qt5
    Qt5, Phonon 4 on Qt4*
    Qt5, Phonon 5 on Qt4*
    Qt5, Phonon 4 on Qt5
    
    Please note that Phonon 5 requires the patch from review 106970 to
    build on Qt5, and that "Qt5, Phonon 4 on Qt5" is fine as far as kdelibs
    is concerned, but Phonon 4 won't actually build on Qt5.


Diffs (updated)
-----

  CMakeLists.txt af6c3ec 
  cmake/modules/FindKDE4Internal.cmake f99aaee 
  interfaces/CMakeLists.txt d496d01 
  interfaces/kmediaplayer/CMakeLists.txt 4413131 
  khtml/CMakeLists.txt db08b27 
  knotify/config/CMakeLists.txt ae0933d 
  knotify/config/knotify-config.h.cmake PRE-CREATION 
  knotify/config/knotifyconfigactionswidget.cpp de892fe 

Diff: http://git.reviewboard.kde.org/r/106987/diff/


Testing
-------


Thanks,

Jon Severinsson

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20121123/0ef6ce42/attachment-0001.html>