Changeset 561 for trunk/src/plugins/phonon

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/plugins/phonon/mmf (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/plugins/phonon/mmf )
• src/plugins/phonon/mmf/mmf.pro (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/plugins/phonon/mmf/mmf.pro )
• src/plugins/phonon/phonon.pro (modified) (1 diff)
• src/plugins/phonon/qt7/qt7.pro (modified) (1 diff)

trunk/src/plugins/phonon/phonon.pro

@@ -8 +8 @@
 wince*:contains(QT_CONFIG, phonon-backend): SUBDIRS *= waveout
 wince*:contains(QT_CONFIG, directshow): SUBDIRS *= ds9
+
+# Note that the MMF backend is in some scenarios an important complement to the
+# Helix backend: the latter requires Symbian signed capabilities, hence MMF
+# provides multimedia for self signed scenarios.
+symbian:contains(QT_CONFIG, phonon-backend): SUBDIRS *= mmf

trunk/src/plugins/phonon/qt7/qt7.pro

@@ -13 +13 @@
 }
 
-LIBS += -framework AudioUnit \
+LIBS += -framework AppKit -framework AudioUnit \
         -framework AudioToolbox -framework CoreAudio \
         -framework QuartzCore -framework QTKit