diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-13 10:39:21 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-13 10:39:21 (GMT) |
| commit | 3aca005d4721b82446922310496271ebe206a0d7 (patch) | |
| tree | f71298b19bd98c6b3751bc9009b2fdb49c2ad526 /examples/phonon/capabilities/window.h | |
| parent | 6088336d9237eaa94def8c2a83901b547e682abb (diff) | |
| parent | 48e08ee5718b3de855ecea626179ad5323e38fa0 (diff) | |
| download | Qt-3aca005d4721b82446922310496271ebe206a0d7.zip Qt-3aca005d4721b82446922310496271ebe206a0d7.tar.gz Qt-3aca005d4721b82446922310496271ebe206a0d7.tar.bz2 | |
Merge remote branch 'mainline/4.6' into 4.6
Conflicts:
tests/auto/linguist/lupdate/testlupdate.cpp
Diffstat (limited to 'examples/phonon/capabilities/window.h')
| -rw-r--r-- | examples/phonon/capabilities/window.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/examples/phonon/capabilities/window.h b/examples/phonon/capabilities/window.h index eadafa3..a0da461 100644 --- a/examples/phonon/capabilities/window.h +++ b/examples/phonon/capabilities/window.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -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 |