Make phonon compile

8 files changed, 33 insertions, 13 deletions

diff --git a/src/phonon/phonon.pro b/src/phonon/phonon.pro
index b16c5a1..9da6a25 100644
--- a/src/phonon/phonon.pro
+++ b/src/phonon/phonon.pro
@@ -1,5 +1,8 @@
+load(qt_module)
+
 TARGET = phonon
-include(../qbase.pri)
+QPRO_PWD   = $$PWD
+include($$QT_SOURCE_TREE/src/qbase.pri)
 
 PHONON_MAJOR_VERSION = $${QT_MAJOR_VERSION}
 PHONON_MINOR_VERSION = 4
@@ -9,7 +12,7 @@ VERSION = $${PHONON_MAJOR_VERSION}.$${PHONON_MINOR_VERSION}.$${PHONON_PATCH_VERS
 DEPENDPATH += .
 DEFINES += MAKE_PHONON_LIB
 
-PHONON_DIR = $$QT_SOURCE_TREE/src/3rdparty/phonon/phonon
+PHONON_DIR = ../3rdparty/phonon/phonon
 
 unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork
 
diff --git a/src/plugins/phonon/ds9/ds9.pro b/src/plugins/phonon/ds9/ds9.pro
index 301808e..4b6c0e7 100644
--- a/src/plugins/phonon/ds9/ds9.pro
+++ b/src/plugins/phonon/ds9/ds9.pro
@@ -1,3 +1,5 @@
+load(qt_module)
+
 DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend
 QT += phonon
 win32:!wince*:contains(QT_CONFIG,opengl):LIBS += -lopengl32
@@ -7,7 +9,7 @@ LIBS += -lstrmiids -ldmoguids -luuid -lmsdmo -lole32 -loleaut32
 TARGET = phonon_ds9
 
 DEFINES += PHONON_MAKE_QT_ONLY_BACKEND
-PHONON_DS9_DIR = $$QT_SOURCE_TREE/src/3rdparty/phonon/ds9
+PHONON_DS9_DIR = ../../../3rdparty/phonon/ds9
 
 # Input
 HEADERS += \
@@ -63,4 +65,4 @@ wince*:HEADERS  += $$PHONON_DS9_DIR/videorenderer_default.h
 target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend
 INSTALLS += target
 
-include(../../qpluginbase.pri)
+include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri)
diff --git a/src/plugins/phonon/gstreamer/gstreamer.pro b/src/plugins/phonon/gstreamer/gstreamer.pro
index c0d2604..1df4a78 100644
--- a/src/plugins/phonon/gstreamer/gstreamer.pro
+++ b/src/plugins/phonon/gstreamer/gstreamer.pro
@@ -1,3 +1,5 @@
+load(qt_module)
+
 TARGET = phonon_gstreamer
 DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend
 
@@ -11,7 +13,7 @@ contains(QT_CONFIG, opengl):QT += opengl
 QMAKE_CXXFLAGS += $$QT_CFLAGS_GSTREAMER
 LIBS += $$QT_LIBS_GSTREAMER -lgstinterfaces-0.10 -lgstvideo-0.10 -lgstbase-0.10 -lgstaudio-0.10
 
-PHONON_GSTREAMER_DIR = $$QT_SOURCE_TREE/src/3rdparty/phonon/gstreamer
+PHONON_GSTREAMER_DIR = ../../../3rdparty/phonon/gstreamer
 
 HEADERS += $$PHONON_GSTREAMER_DIR/common.h \
  $$PHONON_GSTREAMER_DIR/audiooutput.h \
@@ -66,4 +68,4 @@ SOURCES += $$PHONON_GSTREAMER_DIR/abstractrenderer.cpp \
 target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend
 INSTALLS += target
 
-include(../../qpluginbase.pri)
+include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri)
diff --git a/src/plugins/phonon/mmf/mmf.pro b/src/plugins/phonon/mmf/mmf.pro
index 7c7c1d7..9bf50c7 100644
--- a/src/plugins/phonon/mmf/mmf.pro
+++ b/src/plugins/phonon/mmf/mmf.pro
@@ -1,8 +1,10 @@
+load(qt_module)
+
 # MMF Phonon backend
 symbian {
 	QT += phonon
 	TARGET = phonon_mmf
-	PHONON_MMF_DIR = $$QT_SOURCE_TREE/src/3rdparty/phonon/mmf
+	PHONON_MMF_DIR = ../../../3rdparty/phonon/mmf
 
 	# Uncomment the following line in order to use the CDrmPlayerUtility client
 	# API for audio playback, rather than CMdaAudioPlayerUtility.
@@ -20,7 +22,7 @@ symbian {
 	# '#include <videoplayer.h>' picks up the Symbian header, as intended.
 	PREPEND_INCLUDEPATH = $${EPOCROOT}epoc32/include
 
-	PREPEND_INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty
+	PREPEND_INCLUDEPATH += ../../../3rdparty
 
 	INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
 
@@ -140,7 +142,7 @@ symbian {
 	target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend
 	INSTALLS += target
 
-	include(../../qpluginbase.pri)
+	include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri)
 
 	TARGET.UID3=0x2001E629
 }
diff --git a/src/plugins/phonon/qt7/qt7.pro b/src/plugins/phonon/qt7/qt7.pro
index 53407db..d00ba88 100644
--- a/src/plugins/phonon/qt7/qt7.pro
+++ b/src/plugins/phonon/qt7/qt7.pro
@@ -1,3 +1,5 @@
+load(qt_module)
+
 QT += opengl phonon
 TARGET = phonon_qt7
 DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend
@@ -19,7 +21,7 @@ LIBS += -framework AppKit -framework AudioUnit \
 DEPENDPATH += .
 INCLUDEPATH += . 
 
-PHONON_QUICKTIME_DIR=$$QT_SOURCE_TREE/src/3rdparty/phonon/qt7
+PHONON_QUICKTIME_DIR=../../../3rdparty/phonon/qt7
 
 # Input
 HEADERS += $$PHONON_QUICKTIME_DIR/medianode.h \
@@ -73,4 +75,4 @@ OBJECTIVE_SOURCES += $$PHONON_QUICKTIME_DIR/quicktimevideoplayer.mm \
 target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend
 INSTALLS += target
 
-include(../../qpluginbase.pri)
+include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri)
diff --git a/src/plugins/phonon/waveout/waveout.pro b/src/plugins/phonon/waveout/waveout.pro
index 1e2bd33..4816b66 100644
--- a/src/plugins/phonon/waveout/waveout.pro
+++ b/src/plugins/phonon/waveout/waveout.pro
@@ -1,10 +1,12 @@
+load(qt_module)
+
 DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend
 QT += phonon
 win32-msvc2005:DEFINES += _CRT_SECURE_NO_WARNINGS
 TARGET = phonon_waveout
 
 DEFINES += PHONON_MAKE_QT_ONLY_BACKEND
-PHONON_WAVEOUT_DIR = $$QT_SOURCE_TREE/src/3rdparty/phonon/waveout
+PHONON_WAVEOUT_DIR = ../../../3rdparty/phonon/waveout
 
 # Input
 HEADERS += $$PHONON_WAVEOUT_DIR/audiooutput.h \
@@ -20,4 +22,4 @@ SOURCES += $$PHONON_WAVEOUT_DIR/audiooutput.cpp \
 target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend
 INSTALLS += target
 
-include(../../qpluginbase.pri)
+include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri)
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
new file mode 100644
index 0000000..eb448e0
--- /dev/null
+++ b/src/plugins/plugins.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+CONFIG += ordered
+SUBDIRS += phonon \
diff --git a/src/src.pro b/src/src.pro
new file mode 100644
index 0000000..4109e26
--- /dev/null
+++ b/src/src.pro
@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+CONFIG += ordered
+SUBDIRS += phonon \
+           plugins \