Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-staging:
  Merge the demos and examples in qtphonon.

1 files changed, 39 insertions, 0 deletions

diff --git a/examples/phonon/qmediaplayer/qmediaplayer.pro b/examples/phonon/qmediaplayer/qmediaplayer.pro
new file mode 100644
index 0000000..901cf5e
--- /dev/null
+++ b/examples/phonon/qmediaplayer/qmediaplayer.pro
@@ -0,0 +1,39 @@
+######################################################################
+# Automatically generated by qmake (2.01a) Thu Aug 23 18:02:14 2007
+######################################################################
+
+TEMPLATE = app
+DEPENDPATH += . build src ui
+
+QT += phonon
+
+FORMS += settings.ui
+RESOURCES += mediaplayer.qrc
+
+!win32:CONFIG += CONSOLE
+
+SOURCES += main.cpp mediaplayer.cpp
+HEADERS += mediaplayer.h
+
+target.path = $$[QT_INSTALL_EXAMPLES]/phonon/qmediaplayer
+sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.html *.doc images
+sources.path = $$[QT_INSTALL_EXAMPLES]/phonon/qmediaplayer
+INSTALLS += target sources
+
+wince*{
+DEPLOYMENT_PLUGIN += phonon_ds9 phonon_waveout
+}
+
+symbian {
+    TARGET.UID3 = 0xA000C613
+
+     addFiles.files = ../embedded/desktopservices/data/sax.mp3
+     addFiles.path = /data/sounds/
+     DEPLOYMENT += addFiles
+
+    CONFIG += qt_demo
+
+	LIBS += -lcommdb
+
+    TARGET.CAPABILITY="NetworkServices"
+}