fix build of phononwidgets plugin

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/phonon/graphicsview/glpainter.cpp b/src/phonon/graphicsview/glpainter.cpp
index 432f198..92df4b5 100644 (file)
--- a/src/phonon/graphicsview/glpainter.cpp
+++ b/src/phonon/graphicsview/glpainter.cpp
@@ -21,6 +21,8 @@
 
 #include "glpainter.h"
 
+#include <QtOpenGL/qglfunctions.h>
+
 namespace Phonon {
 
 GlPainter::GlPainter() :

diff --git a/src/phonon/graphicsview/glslpainter.cpp b/src/phonon/graphicsview/glslpainter.cpp
index 457aca9..b29be5a 100644 (file)
--- a/src/phonon/graphicsview/glslpainter.cpp
+++ b/src/phonon/graphicsview/glslpainter.cpp
@@ -21,11 +21,10 @@
 */
 
 #include "glslpainter.h"
+#include "videoframe.h"
 
 #include <QtOpenGL/QGLShaderProgram>
 
-#include "videoframe.h"
-
 namespace Phonon {
 
 void GlslPainter::calculateFPS()

diff --git a/src/phonon/graphicsview/glslpainter.h b/src/phonon/graphicsview/glslpainter.h
index 5fc4804..3fe519a 100644 (file)
--- a/src/phonon/graphicsview/glslpainter.h
+++ b/src/phonon/graphicsview/glslpainter.h
@@ -23,6 +23,7 @@
 #define PHONON_GLSLPAINTER_H
 
 #include <QtCore/qdatetime.h>
+#include <QtOpenGL/qglfunctions.h>
 
 #include "glpainter.h"
 
@@ -30,7 +31,7 @@ class QGLShaderProgram;
 
 namespace Phonon {
 
-class GlslPainter : public GlPainter
+class GlslPainter : public GlPainter, protected QGLFunctions
 {
 public:
     GlslPainter();

diff --git a/src/plugins/designer/phonon/phonon.cmake b/src/plugins/designer/phonon/phonon.cmake
index 82c1316..5a31ce8 100644 (file)
--- a/src/plugins/designer/phonon/phonon.cmake
+++ b/src/plugins/designer/phonon/phonon.cmake
@@ -1,3 +1,7 @@
+include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}/designer/phonon
+)
+
 set(PHONONWIDGETSLUGIN_SOURCES
     ${PHONONWIDGETSLUGIN_SOURCES}
     ${CMAKE_CURRENT_SOURCE_DIR}/designer/phonon/phononcollection.cpp
@@ -6,9 +10,22 @@ set(PHONONWIDGETSLUGIN_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/designer/phonon/videoplayertaskmenu.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/designer/phonon/videowidgetplugin.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/designer/phonon/volumesliderplugin.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/designer/phonon/phononwidgets.qrc
 )
 
-add_library(phononwidgetsplugin ${KATIE_TYPE} ${QTIFFPLUGIN_SOURCES})
+set(PHONONWIDGETSLUGIN_HEADERS
+    ${PHONONWIDGETSLUGIN_HEADERS}
+    ${CMAKE_CURRENT_SOURCE_DIR}/designer/phonon/seeksliderplugin.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/designer/phonon/volumesliderplugin.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/designer/phonon/videoplayerplugin.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/designer/phonon/videowidgetplugin.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/designer/phonon/videoplayertaskmenu.h
+)
+
+katie_resources(${PHONONWIDGETSLUGIN_SOURCES})
+katie_resources(${PHONONWIDGETSLUGIN_HEADERS})
+
+add_library(phononwidgetsplugin ${KATIE_TYPE} ${PHONONWIDGETSLUGIN_SOURCES} ${PHONONWIDGETSLUGIN_HEADERS})
 target_link_libraries(phononwidgetsplugin KtCore KtGui KtPhonon KtDesigner)
 set_target_properties(phononwidgetsplugin PROPERTIES OUTPUT_NAME phononwidgets)
 

diff --git a/src/plugins/designer/phonon/phononcollection.cpp b/src/plugins/designer/phonon/phononcollection.cpp
index 1843859..6327177 100644 (file)
--- a/src/plugins/designer/phonon/phononcollection.cpp
+++ b/src/plugins/designer/phonon/phononcollection.cpp
@@ -65,15 +65,12 @@
 #include "videowidgetplugin.h"
 #include "volumesliderplugin.h"
 
-#include <QtDesigner/QDesignerCustomWidgetCollectionInterface>
+#include <QtUiTools/customwidget.h>
 #include <QtCore/qplugin.h>
 
 class PhononCollection: public QObject, public QDesignerCustomWidgetCollectionInterface
 {
     Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-    Q_PLUGIN_METADATA(IID "org.kde.phonon.PhononCollection")
-#endif
     Q_INTERFACES(QDesignerCustomWidgetCollectionInterface)
 public:
     explicit PhononCollection(QObject *parent = 0);
@@ -99,8 +96,6 @@ QList<QDesignerCustomWidgetInterface*> PhononCollection::customWidgets() const
     return m_plugins;
 }
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 Q_EXPORT_PLUGIN(PhononCollection)
-#endif
 
-#include "phononcollection.moc"
+#include "moc_phononcollection.cpp"

diff --git a/src/plugins/designer/phonon/seeksliderplugin.cpp b/src/plugins/designer/phonon/seeksliderplugin.cpp
index 82b83ed..2479c7c 100644 (file)
--- a/src/plugins/designer/phonon/seeksliderplugin.cpp
+++ b/src/plugins/designer/phonon/seeksliderplugin.cpp
@@ -111,3 +111,4 @@ QString SeekSliderPlugin::domXml() const
         <widget class=\"Phonon::SeekSlider\" name=\"seekSlider\"/>\
     </ui>");
 }
+#include "moc_seeksliderplugin.h"

diff --git a/src/plugins/designer/phonon/seeksliderplugin.h b/src/plugins/designer/phonon/seeksliderplugin.h
index d965403..e8ee40f 100644 (file)
--- a/src/plugins/designer/phonon/seeksliderplugin.h
+++ b/src/plugins/designer/phonon/seeksliderplugin.h
@@ -42,7 +42,7 @@
 #ifndef SEEKSLIDER_PLUGIN_H
 #define SEEKSLIDER_PLUGIN_H
 
-#include <QtDesigner/QDesignerCustomWidgetInterface>
+#include <QtUiTools/customwidget.h>
 
 class SeekSliderPlugin: public QObject, public QDesignerCustomWidgetInterface
 {

diff --git a/src/plugins/designer/phonon/videoplayerplugin.cpp b/src/plugins/designer/phonon/videoplayerplugin.cpp
index 7aa1747..f9701b2 100644 (file)
--- a/src/plugins/designer/phonon/videoplayerplugin.cpp
+++ b/src/plugins/designer/phonon/videoplayerplugin.cpp
@@ -63,9 +63,9 @@
 #include "videoplayerplugin.h"
 #include "videoplayertaskmenu.h"
 
-#include <QtDesigner/QExtensionFactory>
+#include <QtDesigner/default_extensionfactory.h>
 #include <QtDesigner/QExtensionManager>
-#include <QtDesigner/QDesignerFormEditorInterface>
+#include <QtDesigner/abstractformeditor.h>
 
 #include <QtCore/qplugin.h>
 #include <phonon/videoplayer.h>
@@ -154,3 +154,4 @@ QString VideoPlayerPlugin::domXml() const
         </widget>\
     </ui>");
 }
+#include "moc_videoplayerplugin.h"

diff --git a/src/plugins/designer/phonon/videoplayerplugin.h b/src/plugins/designer/phonon/videoplayerplugin.h
index 782bff2..3e2db5b 100644 (file)
--- a/src/plugins/designer/phonon/videoplayerplugin.h
+++ b/src/plugins/designer/phonon/videoplayerplugin.h
@@ -42,7 +42,7 @@
 #ifndef VIDEOPLAYER_PLUGIN_H
 #define VIDEOPLAYER_PLUGIN_H
 
-#include <QtDesigner/QDesignerCustomWidgetInterface>
+#include <QtUiTools/customwidget.h>
 
 class VideoPlayerPlugin: public QObject, public QDesignerCustomWidgetInterface
 {

diff --git a/src/plugins/designer/phonon/videoplayertaskmenu.cpp b/src/plugins/designer/phonon/videoplayertaskmenu.cpp
index 385295a..5f4a280 100644 (file)
--- a/src/plugins/designer/phonon/videoplayertaskmenu.cpp
+++ b/src/plugins/designer/phonon/videoplayertaskmenu.cpp
@@ -62,9 +62,9 @@
 
 #include "videoplayertaskmenu.h"
 
-#include <QtDesigner/QDesignerFormWindowInterface>
-#include <QtDesigner/QDesignerFormWindowCursorInterface>
-#include <QtDesigner/QDesignerFormEditorInterface>
+#include <QtDesigner/abstractformwindow.h>
+#include <QtDesigner/abstractformwindowcursor.h>
+#include <QtDesigner/abstractformeditor.h>
 #include <QtDesigner/QExtensionManager>
 
 #include <phonon/backendcapabilities.h>
@@ -188,3 +188,4 @@ QObject *VideoPlayerTaskMenuFactory::createExtension(QObject *object,
 
     return 0;
 }
+#include "moc_videoplayertaskmenu.h"

diff --git a/src/plugins/designer/phonon/videoplayertaskmenu.h b/src/plugins/designer/phonon/videoplayertaskmenu.h
index fc7f8d0..0e62b5b 100644 (file)
--- a/src/plugins/designer/phonon/videoplayertaskmenu.h
+++ b/src/plugins/designer/phonon/videoplayertaskmenu.h
@@ -64,8 +64,8 @@
 #define VIDEOPLAYERTASKMENU_H
 
 #include <QtCore/QObject>
-#include <QtDesigner/QDesignerTaskMenuExtension>
-#include <QtDesigner/QExtensionFactory>
+#include <QtDesigner/taskmenu.h>
+#include <QtDesigner/default_extensionfactory.h>
 
 #include <phonon/phononnamespace.h>
 

diff --git a/src/plugins/designer/phonon/videowidgetplugin.cpp b/src/plugins/designer/phonon/videowidgetplugin.cpp
index 1597cad..a10b49a 100644 (file)
--- a/src/plugins/designer/phonon/videowidgetplugin.cpp
+++ b/src/plugins/designer/phonon/videowidgetplugin.cpp
@@ -21,9 +21,9 @@
 
 #include "videowidgetplugin.h"
 
-#include <QtDesigner/QExtensionFactory>
+#include <QtDesigner/default_extensionfactory.h>
 #include <QtDesigner/QExtensionManager>
-#include <QtDesigner/QDesignerFormEditorInterface>
+#include <QtDesigner/abstractformeditor.h>
 
 #include <QtCore/qplugin.h>
 
@@ -108,3 +108,4 @@ QString VideoWidgetPlugin::domXml() const
         </widget>\
     </ui>");
 }
+#include "moc_videowidgetplugin.h"

diff --git a/src/plugins/designer/phonon/videowidgetplugin.h b/src/plugins/designer/phonon/videowidgetplugin.h
index ce79809..14d684c 100644 (file)
--- a/src/plugins/designer/phonon/videowidgetplugin.h
+++ b/src/plugins/designer/phonon/videowidgetplugin.h
@@ -22,7 +22,7 @@
 #ifndef VIDEOWIDGET_PLUGIN_H
 #define VIDEOWIDGET_PLUGIN_H
 
-#include <QtDesigner/QDesignerCustomWidgetInterface>
+#include <QtUiTools/customwidget.h>
 
 class VideoWidgetPlugin: public QObject, public QDesignerCustomWidgetInterface
 {

diff --git a/src/plugins/designer/phonon/volumesliderplugin.cpp b/src/plugins/designer/phonon/volumesliderplugin.cpp
index 611756f..d7dd525 100644 (file)
--- a/src/plugins/designer/phonon/volumesliderplugin.cpp
+++ b/src/plugins/designer/phonon/volumesliderplugin.cpp
@@ -111,3 +111,4 @@ QString VolumeSliderPlugin::domXml() const
         <widget class=\"Phonon::VolumeSlider\" name=\"volumeSlider\"/>\
     </ui>");
 }
+#include "moc_volumesliderplugin.h"

diff --git a/src/plugins/designer/phonon/volumesliderplugin.h b/src/plugins/designer/phonon/volumesliderplugin.h
index 47705d1..351a765 100644 (file)
--- a/src/plugins/designer/phonon/volumesliderplugin.h
+++ b/src/plugins/designer/phonon/volumesliderplugin.h
@@ -42,7 +42,7 @@
 #ifndef VOLUMESLIDER_PLUGIN_H
 #define VOLUMESLIDER_PLUGIN_H
 
-#include <QtDesigner/QDesignerCustomWidgetInterface>
+#include <QtUiTools/customwidget.h>
 
 class VolumeSliderPlugin: public QObject, public QDesignerCustomWidgetInterface
 {