Introduction and PhononQt5 porting

Hi everyone I recently got some time to spare (nut much, but a few hours a week), and rather than getting a life I decided to try to help out with the Kde Frameworks 5 cleanup. I must admit I have never coded KDE before, though I am a long-time KDE SC user (since KDE 3.4.x) and Qt developer (since

[PATCH 1/3] Port from QAbstractItemModel::reset() to QAbstractItemModel::(begin|end)ResetModel().

This is the recommended API in Qt >= 4.6, and the only API in Qt5. --- phonon/objectdescriptionmodel.cpp |3 ++- phonon/objectdescriptionmodel_p.h |3 ++- 2 filer ändrade, 4 tillägg(+), 2 borttagningar(-) diff --git a/phonon/objectdescriptionmodel.cpp b/phonon/objectdescriptionmodel.cpp

[PATCH 2/3] Don't use the unsafe QAtomicPointer accessors in PHONON_GLOBAL_STATIC_WITH_ARGS.

These could lead to race conditions, and are removed from Qt5. --- phonon/globalstatic_p.h |8 +++- 1 fil ändrad, 3 tillägg(+), 5 borttagningar(-) diff --git a/phonon/globalstatic_p.h b/phonon/globalstatic_p.h index cf80512..7555630 100644 --- a/phonon/globalstatic_p.h +++ b/phonon/global

[PATCH 3/3] Fix build without OpenGL.

--- CMakeLists.txt |3 -- phonon/CMakeLists.txt | 42 ++- phonon/graphicsview/CMakeLists.txt | 23 --- phonon/graphicsview/videographicsobject.cpp | 11 ++- 4 filer ändrade, 39 tillägg(+),

[PATCH 1/9] Remove remnants of old dbus code.

--- CMakeLists.txt |5 - cmake/FindPhononInternal.cmake |7 --- phonon.pc.cmake|2 +- 3 filer ändrade, 1 tillägg(+), 13 borttagningar(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index af36f50..2cb6db5 100644 --- a/CMakeLists.txt +++ b/CMakeL

[PATCH 2/9] Remove remnants of old experimental code.

--- Mainpage.dox |2 +- PhononConfig.cmake.in | 16 +--- doc/CMakeLists.txt |1 - includes/CMakeLists.txt| 14 -- .../o

[PATCH 3/9] Always use cmake's internal automoc support.

This increases the required cmake version to 2.8.6. --- CMakeLists.txt |2 +- cmake/CMakeLists.txt|1 - cmake/FindAutomoc4.cmake| 56 --- cmake/FindPhononInternal.cmake | 31 ++- demos

[PATCH 4/9] Migrate to Qt5Transitional.cmake in order to support both Qt4 and Qt5.

--- cmake/FindPhononInternal.cmake | 27 +-- demos/metadatareader/CMakeLists.txt |9 + demos/phota/CMakeLists.txt |9 + demos/simplecapture/CMakeLists.txt |9 + demos/simpleplayer/CMakeLists.txt |9 + 5 file

[PATCH 5/9] Update FindPhononInternal.cmake compiler specific settings with FindKDE4Internal.cmake changes from the kde framewoeks branch.

--- cmake/FindPhononInternal.cmake | 110 ++-- 1 fil ändrad, 71 tillägg(+), 39 borttagningar(-) diff --git a/cmake/FindPhononInternal.cmake b/cmake/FindPhononInternal.cmake index 91e318f..4321109 100644 --- a/cmake/FindPhononInternal.cmake +++ b/cmake/FindPhon

[PATCH 7/9] Fix ObjectDescriptionModel<*>::staticMetaObject initialization on Qt5.

The internals of QMetaObject has apperently changed. This commit is only tested, and still emmits warnings, so probably isn't enough. --- phonon/objectdescriptionmodel.cpp | 43 ++--- 1 fil ändrad, 30 tillägg(+), 13 borttagningar(-) diff --git a/phonon/objectdesc

[PATCH 8/9] Replace #include with just #include

Needed for Qt5, as QGraphicsObject moved to QtWidgets. --- phonon/graphicsview/videographicsobject.h |2 +- 1 fil ändrad, 1 tillägg(+), 1 borttagning(-) diff --git a/phonon/graphicsview/videographicsobject.h b/phonon/graphicsview/videographicsobject.h index 0fcbf60..4cad2ad 100644 --- a/phon

[PATCH 6/9] When building against Qt5, use qmake to detect Qt installation paths.

This is done by FindQt4.cmake, but not FindQt5*.cmake, so for Qt5 we have to do it ourselves. --- CMakeLists.txt | 17 + 1 fil ändrad, 17 tillägg(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index ed09836..c9ab5d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,6 +74

[PATCH 9/9] Remove QFSFileEngine useage.

QFSFileEngine has been removed from Qt5. --- phonon/mediasource.cpp |6 +++--- 1 fil ändrad, 3 tillägg(+), 3 borttagningar(-) diff --git a/phonon/mediasource.cpp b/phonon/mediasource.cpp index 9e35094..14235cb 100644 --- a/phonon/mediasource.cpp +++ b/phonon/mediasource.cpp @@ -28,7 +28,7 @@

Re: Introduction and PhononQt5 porting

Hi again With the previosly mentioned updated phonon [1], and these three fixes to kdelibs [2], it all compiles for me. The unit test does however show several failure, but I'll have to investigate that another day, as it is past midnight here... Best reggards Jon «Jonno» Severinsson [1] https:/

[PATCH 1/3] Drop KDE_NO_PHONON, Phonon works on Qt5 now.

--- CMakeLists.txt| 10 +- interfaces/CMakeLists.txt |4 +--- knotify/config/knotifyconfigactionswidget.cpp |2 -- 3 filer ändrade, 2 tillägg(+), 14 borttagningar(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e8f3ea0..a

[PATCH 2/3] khtml: Explicitly #include (needed on Qt5).

--- khtml/khtml_ext.cpp |1 + 1 fil ändrad, 1 tillägg(+) diff --git a/khtml/khtml_ext.cpp b/khtml/khtml_ext.cpp index e1956e3..50aaa63 100644 --- a/khtml/khtml_ext.cpp +++ b/khtml/khtml_ext.cpp @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include --

[PATCH 3/3] plasma: QPixmap platform integration has changed in Qt5, disable it for now.

--- plasma/private/windowshadows.cpp |5 + 1 fil ändrad, 5 tillägg(+) diff --git a/plasma/private/windowshadows.cpp b/plasma/private/windowshadows.cpp index 645..f127852 100644 --- a/plasma/private/windowshadows.cpp +++ b/plasma/private/windowshadows.cpp @@ -23,6 +23,11 @@ #include