Changeset 846 for trunk/src/phonon

Timestamp:

May 5, 2011, 5:36:53 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/phonon/phonon.pro (modified) (7 diffs)

trunk/src/phonon/phonon.pro

@@ -3 +3 @@
 
 PHONON_MAJOR_VERSION = $${QT_MAJOR_VERSION}
-PHONON_MINOR_VERSION = 3
-PHONON_PATCH_VERSION = 1
+PHONON_MINOR_VERSION = 
+PHONON_PATCH_VERSION = 
 VERSION = $${PHONON_MAJOR_VERSION}.$${PHONON_MINOR_VERSION}.$${PHONON_PATCH_VERSION}
 
@@ -22 +22 @@
            $$PHONON_DIR/abstractvideooutput_p.h \
            $$PHONON_DIR/addoninterface.h \
+
+
+
            $$PHONON_DIR/audiooutput.h \
            $$PHONON_DIR/audiooutput_p.h \