summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-11-29 10:45:38 +0100
committerQt by Nokia <qt-info@nokia.com>2011-12-22 11:53:35 +0100
commit0f10ce17e75693da521c3a3aac459dfbcbbd62a3 (patch)
treefd8f5df4b26f43a8759c04e69d9c7e2fb6e3208c
parent423f64b352ba7d33323415de701473c2fa475f3b (diff)
QtPhonon: Fix gstreamer build on Linux when qpa is not defined.
Currently, qpa is contained in the CONFIG variable. We are working towards removing that since qpa (Lighthouse) is the default in Qt 5. Profiles/Source code should no longer contain conditional sections depending on qpa/Q_WS_QPA. Change-Id: I3ebe2ce201eeac6345a4abac365c3b66b3114d61 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
-rw-r--r--src/3rdparty/phonon/gstreamer/x11renderer.cpp2
-rw-r--r--src/3rdparty/phonon/gstreamer/x11renderer.h2
-rw-r--r--src/plugins/phonon/gstreamer/gstreamer.pro2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/phonon/gstreamer/x11renderer.cpp b/src/3rdparty/phonon/gstreamer/x11renderer.cpp
index 968f3a8..412f40c 100644
--- a/src/3rdparty/phonon/gstreamer/x11renderer.cpp
+++ b/src/3rdparty/phonon/gstreamer/x11renderer.cpp
@@ -21,7 +21,7 @@
#ifndef Q_WS_QWS
#include <QtGui/QPalette>
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
#include <QtGui/QPainter>
#include <X11/Xlib.h>
#include <gst/gst.h>
diff --git a/src/3rdparty/phonon/gstreamer/x11renderer.h b/src/3rdparty/phonon/gstreamer/x11renderer.h
index 8e2ea19..558015f 100644
--- a/src/3rdparty/phonon/gstreamer/x11renderer.h
+++ b/src/3rdparty/phonon/gstreamer/x11renderer.h
@@ -21,7 +21,7 @@
#include "videowidget.h"
#include "common.h"
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
#include <gst/gst.h>
diff --git a/src/plugins/phonon/gstreamer/gstreamer.pro b/src/plugins/phonon/gstreamer/gstreamer.pro
index 642195b..aeb488e 100644
--- a/src/plugins/phonon/gstreamer/gstreamer.pro
+++ b/src/plugins/phonon/gstreamer/gstreamer.pro
@@ -60,7 +60,7 @@ SOURCES += $$PHONON_GSTREAMER_DIR/abstractrenderer.cpp \
$$PHONON_GSTREAMER_DIR/volumefadereffect.cpp \
$$PHONON_GSTREAMER_DIR/widgetrenderer.cpp
-!qpa:!embedded{
+false {
HEADERS += $$PHONON_GSTREAMER_DIR/x11renderer.h
SOURCES += $$PHONON_GSTREAMER_DIR/x11renderer.cpp
}