1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
|
From f028eb6ec70a58f9b1382ea538b9b1f10de658a9 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@nokia.com>
Date: Wed, 29 Dec 2010 07:55:52 +0100
Subject: [PATCH] Make phonon compile
---
qtphonon/modules/qt_phonon.pri | 6 ++++++
qtphonon/qtphonon.pro | 4 ++++
qtphonon/src/phonon/phonon.pro | 7 +++++--
qtphonon/src/plugins/phonon/ds9/ds9.pro | 6 ++++--
.../src/plugins/phonon/gstreamer/gstreamer.pro | 6 ++++--
qtphonon/src/plugins/phonon/mmf/mmf.pro | 8 +++++---
qtphonon/src/plugins/phonon/qt7/qt7.pro | 6 ++++--
qtphonon/src/plugins/phonon/waveout/waveout.pro | 6 ++++--
qtphonon/src/plugins/plugins.pro | 3 +++
qtphonon/src/src.pro | 4 ++++
qtphonon/sync.profile | 15 +++++++++++++++
11 files changed, 58 insertions(+), 13 deletions(-)
create mode 100644 qtphonon/modules/qt_phonon.pri
create mode 100644 qtphonon/qtphonon.pro
create mode 100644 qtphonon/src/plugins/plugins.pro
create mode 100644 qtphonon/src/src.pro
create mode 100644 qtphonon/sync.profile
diff --git a/qtphonon/modules/qt_phonon.pri b/qtphonon/modules/qt_phonon.pri
new file mode 100644
index 0000000..ec7757d
--- /dev/null
+++ b/qtphonon/modules/qt_phonon.pri
@@ -0,0 +1,6 @@
+QT.phonon.name = phonon
+QT.phonon.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/phonon
+QT.phonon.private_includes = $$QT_MODULE_INCLUDE_BASE/phonon/private
+QT.phonon.sources = $$QT_MODULE_BASE/src/3rdparty/phonon/phonon
+QT.phonon.libs = $$QT_MODULE_LIB_BASE
+QT.phonon.depends = core gui network
diff --git a/qtphonon/qtphonon.pro b/qtphonon/qtphonon.pro
new file mode 100644
index 0000000..0da9087
--- /dev/null
+++ b/qtphonon/qtphonon.pro
@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+CONFIG += ordered
+SUBDIRS += src \
+# examples \
diff --git a/qtphonon/src/phonon/phonon.pro b/qtphonon/src/phonon/phonon.pro
index b16c5a1..9da6a25 100644
--- a/qtphonon/src/phonon/phonon.pro
+++ b/qtphonon/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/qtphonon/src/plugins/phonon/ds9/ds9.pro b/qtphonon/src/plugins/phonon/ds9/ds9.pro
index 301808e..4b6c0e7 100644
--- a/qtphonon/src/plugins/phonon/ds9/ds9.pro
+++ b/qtphonon/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/qtphonon/src/plugins/phonon/gstreamer/gstreamer.pro b/qtphonon/src/plugins/phonon/gstreamer/gstreamer.pro
index c0d2604..1df4a78 100644
--- a/qtphonon/src/plugins/phonon/gstreamer/gstreamer.pro
+++ b/qtphonon/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/qtphonon/src/plugins/phonon/mmf/mmf.pro b/qtphonon/src/plugins/phonon/mmf/mmf.pro
index 7c7c1d7..9bf50c7 100644
--- a/qtphonon/src/plugins/phonon/mmf/mmf.pro
+++ b/qtphonon/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/qtphonon/src/plugins/phonon/qt7/qt7.pro b/qtphonon/src/plugins/phonon/qt7/qt7.pro
index 53407db..d00ba88 100644
--- a/qtphonon/src/plugins/phonon/qt7/qt7.pro
+++ b/qtphonon/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/qtphonon/src/plugins/phonon/waveout/waveout.pro b/qtphonon/src/plugins/phonon/waveout/waveout.pro
index 1e2bd33..4816b66 100644
--- a/qtphonon/src/plugins/phonon/waveout/waveout.pro
+++ b/qtphonon/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/qtphonon/src/plugins/plugins.pro b/qtphonon/src/plugins/plugins.pro
new file mode 100644
index 0000000..eb448e0
--- /dev/null
+++ b/qtphonon/src/plugins/plugins.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+CONFIG += ordered
+SUBDIRS += phonon \
diff --git a/qtphonon/src/src.pro b/qtphonon/src/src.pro
new file mode 100644
index 0000000..4109e26
--- /dev/null
+++ b/qtphonon/src/src.pro
@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+CONFIG += ordered
+SUBDIRS += phonon \
+ plugins \
diff --git a/qtphonon/sync.profile b/qtphonon/sync.profile
new file mode 100644
index 0000000..ed54cb9
--- /dev/null
+++ b/qtphonon/sync.profile
@@ -0,0 +1,15 @@
+%modules = ( # path to module name map
+ "phonon" => "$basedir/src/3rdparty/phonon/phonon",
+);
+%moduleheaders = ( # restrict the module headers to those found in relative path
+);
+%classnames = (
+);
+%mastercontent = (
+ "core" => "#include <QtCore/QtCore>\n",
+ "gui" => "#include <QtGui/QtGui>\n",
+ "network" => "#include <QtNetwork/QtNetwork>\n",
+);
+%modulepris = (
+ "phonon" => "$basedir/modules/qt_phonon.pri",
+);
--
1.7.3.2.343.g7d43d
|
