--- a/qtmobility/plugins/multimedia/gstreamer/gstreamer.pro	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/gstreamer.pro	Wed Jun 23 19:08:38 2010 +0300
@@ -1,10 +1,12 @@
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtmedia_gstengine)
+TARGET = $$qtLibraryTarget(qgstengine)
 PLUGIN_TYPE=mediaservice
 
 include(../../../common.pri)
-INCLUDEPATH+=../../../src/multimedia
+INCLUDEPATH+=../../../src/multimedia \
+             ../../../src/multimedia/video \
+             ../../../src/multimedia/audio
 
 CONFIG += mobility
 MOBILITY = multimedia
@@ -34,50 +36,47 @@
 HEADERS += \
     qgstreamermessage.h \
     qgstreamerbushelper.h \
-    qgstreamervideooutputcontrol.h \
-    qgstreamervideorendererinterface.h \
-    qgstreamervideowidget.h \
+    qgstreamervideorendererinterface.h \    
     qgstreamerserviceplugin.h \
     qgstreameraudioinputendpointselector.h \
+    qgstreamervideorenderer.h \
+    qgstvideobuffer.h \
+    qvideosurfacegstsink.h \
     qgstreamervideoinputdevicecontrol.h
 
 SOURCES += \
     qgstreamermessage.cpp \
     qgstreamerbushelper.cpp \
-    qgstreamervideooutputcontrol.cpp \
-    qgstreamervideorendererinterface.cpp \
-    qgstreamervideowidget.cpp \
+    qgstreamervideorendererinterface.cpp \    
     qgstreamerserviceplugin.cpp \
     qgstreameraudioinputendpointselector.cpp \
+    qgstreamervideorenderer.cpp \
+    qgstvideobuffer.cpp \
+    qvideosurfacegstsink.cpp \
     qgstreamervideoinputdevicecontrol.cpp
 
-contains(QT_CONFIG, multimedia) {
-    QT += multimedia
+
+!win32:!embedded:!mac:!symbian {
+    LIBS += -lXv
+
+    HEADERS += \
+        qgstreamervideooverlay.h \
+        qgstreamervideowidget.h \
+        qx11videosurface.h \
+        qgstxvimagebuffer.h
 
     SOURCES += \
         qgstreamervideooverlay.cpp \
-        qgstreamervideorenderer.cpp \
-        qgstvideobuffer.cpp \
-        qvideosurfacegstsink.cpp \
+        qgstreamervideowidget.cpp \
         qx11videosurface.cpp \
         qgstxvimagebuffer.cpp
-
-    HEADERS += \
-        qgstreamervideooverlay.h \
-        qgstreamervideorenderer.h \
-        qgstvideobuffer.h \
-        qvideosurfacegstsink.h \
-        qx11videosurface.h \
-        qgstxvimagebuffer.h
-
-
-    LIBS += -lXv
 }
 
 include(mediaplayer/mediaplayer.pri)
 !maemo* {
     include(mediacapture/mediacapture.pri)
 } else {
+    INCLUDEPATH += mediacapture/maemo
     include(mediacapture/maemo/mediacapture_maemo.pri)
     DEFINES += GST_USE_UNSTABLE_API #prevents warnings because of unstable photography API 
 }