diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2010-01-13 11:01:21 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-01-13 11:01:21 (GMT) |
| commit | e60277e8d5934ca9fff8abaf9493a33985ee34c4 (patch) | |
| tree | 087f848d84038e85d456efd1aab49584062269bd /examples/phonon/capabilities/window.h | |
| parent | abd6f1d678757e963909e3202b24e61fb0e865ba (diff) | |
| parent | c01c7f59449aa4c1b2edf260ba8fb783ac180f95 (diff) | |
| download | Qt-e60277e8d5934ca9fff8abaf9493a33985ee34c4.zip Qt-e60277e8d5934ca9fff8abaf9493a33985ee34c4.tar.gz Qt-e60277e8d5934ca9fff8abaf9493a33985ee34c4.tar.bz2 | |
Merge branch '4.6.1' of git@scm.dev.nokia.troll.no:qt/qt-releases into 4.6.1
Diffstat (limited to 'examples/phonon/capabilities/window.h')
| -rw-r--r-- | examples/phonon/capabilities/window.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/examples/phonon/capabilities/window.h b/examples/phonon/capabilities/window.h index 04f1e59..3890f13 100644 --- a/examples/phonon/capabilities/window.h +++ b/examples/phonon/capabilities/window.h @@ -44,14 +44,14 @@ #include <QWidget> -#include <Phonon/AudioOutput> -#include <Phonon/SeekSlider> -#include <Phonon/MediaObject> -#include <Phonon/VolumeSlider> -#include <Phonon/BackendCapabilities> -#include <Phonon/Effect> -#include <Phonon/EffectParameter> -#include <Phonon/ObjectDescriptionModel> +#include <phonon/audiooutput.h> +#include <phonon/seekslider.h> +#include <phonon/mediaobject.h> +#include <phonon/volumeslider.h> +#include <phonon/backendcapabilities.h> +#include <phonon/effect.h> +#include <phonon/effectparameter.h> +#include <phonon/objectdescriptionmodel.h> #include <QList> QT_BEGIN_NAMESPACE |