diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-06-04 09:15:05 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-06-04 09:15:05 (GMT) |
| commit | fc96ef8bf45482483d795fe3d979fb842869a315 (patch) | |
| tree | 5a35b6e505784f9f654b35b7789027432eb58870 /src/phonon | |
| parent | 08d020409ecf08c81f31faf33f1da329177cc207 (diff) | |
| download | Qt-fc96ef8bf45482483d795fe3d979fb842869a315.zip Qt-fc96ef8bf45482483d795fe3d979fb842869a315.tar.gz Qt-fc96ef8bf45482483d795fe3d979fb842869a315.tar.bz2 | |
Added proper UID for phonon.pro, and did some symbian scope cleanup, too.
Diffstat (limited to 'src/phonon')
| -rw-r--r-- | src/phonon/phonon.pro | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/phonon/phonon.pro b/src/phonon/phonon.pro index 679a1b0..b38adb8 100644 --- a/src/phonon/phonon.pro +++ b/src/phonon/phonon.pro @@ -13,13 +13,6 @@ PHONON_DIR = $$QT_SOURCE_TREE/src/3rdparty/phonon/phonon unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork -# Phonon depends on numeric_limits. Enabling STL support in Qt -# would bring in link dependencies, and we don't need that for -# numeric_limits, hence we here merely ensure we bring in the necessary -# header. -symbian:INCLUDEPATH += $${EPOCROOT}epoc32/include/stdapis/stlport \ - $$OS_LAYER_STDCPP_SYSTEMINCLUDE - # Input HEADERS += $$PHONON_DIR/abstractaudiooutput.h \ $$PHONON_DIR/abstractaudiooutput_p.h \ @@ -122,7 +115,16 @@ contains(QT_CONFIG, dbus) { contains(QT_CONFIG, reduce_exports): CONFIG += hide_symbols symbian: { + # Phonon depends on numeric_limits. Enabling STL support in Qt + # would bring in link dependencies, and we don't need that for + # numeric_limits, hence we here merely ensure we bring in the necessary + # header. + INCLUDEPATH *= $${EPOCROOT}epoc32/include/stdapis/stlport \ + $$OS_LAYER_STDCPP_SYSTEMINCLUDE + # Without this setting, code using numeric_limits will fail # for winscw, although armv5 works fine no matter what. - MMP_RULES += "option cw -wchar_t on" + QMAKE_CXXFLAGS.CW *= $$STLLIB_USAGE_CW_FLAGS + + TARGET.UID3 = 0x2001E624 } |