Changeset 561 for trunk/src/3rdparty/phonon/gstreamer/volumefadereffect.h

Timestamp:

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

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/3rdparty/phonon/gstreamer/volumefadereffect.h (modified) (2 diffs)

trunk/src/3rdparty/phonon/gstreamer/volumefadereffect.h

@@ -31 +31 @@
 
 QT_BEGIN_NAMESPACE
-
+#ifndef QT_NO_PHONON_VOLUMEFADEREFFECT
 namespace Phonon
 {
@@ -65 +65 @@
     };
 }} //namespace Phonon::Gstreamer
-
+#endif //QT_NO_PHONON_VOLUMEFADEREFFECT
 QT_END_NAMESPACE