Patch: Phonon headers cleanup

Tanguy Krotoff tkrotoff at gmail.com
Sun Apr 20 23:46:32 CEST 2008


Hello

Here is a small patch that cleans some Phonon headers (against the
last phonon svn of course):
- replace #include <qglobal.h> by #include <QtCore/qglobal.h> (in
order to reduce the include path of Phonon when using CMake)
- replace #include <qtest_kde.h> by #include <QtTest/QTest> when possible
- replace #include <Phonon/*> by #include <phonon/*.h> (not compatible
with Qt-4.4 otherwise)
So nothing fancy.

Goal is to make Phonon and code around, KDE independent when possible.

I managed to compile most of Phonon (phonon-experimental, tests,
examples) using the original CMakeLists.txt (modified a bit of course)
under Windows without all the KDE stuffs.

The modified CMakeLists.txt are still dirty (so no patch). My main
problem is the #include "moc_*" a subject that you should know well
since you wrote the kde_automoc :)
I started to modify qt4_automoc() from FindQt4.cmake in order to
detect automatically #include "moc_*" and #include "*.moc". It works
fine but still I can you give me some explanations about how works
kde_automoc and how it can works for pure Qt apps without all the
Find*.cmake or other KDEMacros.cmake as most Qt4 devs don't really
care about all the KDE subtilities.


Also I send you the phonon.pro from Qt-4.4, adapted to the lastest
phonon svn. I think it should be integrated (only 1 file), thus users
only have to checkout phonon svn and enter qmake to get Phonon on all
platforms supported by Qt!

Thx

PS: should I use the multimedia mailing-list?

-- 
Tanguy Krotoff <tkrotoff at gmail.com>
+33 6 68 42 70 24
-------------- next part --------------
A non-text attachment was scrubbed...
Name: phonon-clean-includes.patch
Type: application/octet-stream
Size: 12100 bytes
Desc: not available
Url : http://mail.kde.org/pipermail/phonon-backends/attachments/20080420/662898c9/attachment.obj 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: phonon.pro
Type: application/octet-stream
Size: 4971 bytes
Desc: not available
Url : http://mail.kde.org/pipermail/phonon-backends/attachments/20080420/662898c9/attachment-0001.obj 


More information about the Phonon-backends mailing list