Changeset 561 for trunk/examples/phonon


Ignore:
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:
1 deleted
7 edited
5 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/examples/phonon/README

    r2 r561  
    1 Qt usese the Phonon cross-platform multimedia framework to play common
     1Qt uses the Phonon cross-platform multimedia framework to play common
    22multimedia formats.
    33

  • trunk/examples/phonon/capabilities/capabilities.pro

    r2 r561  
    1515}
    1616
     17symbian:TARGET.UID3 = 0xA000CF69

  • trunk/examples/phonon/capabilities/main.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the examples of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/examples/phonon/capabilities/window.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the examples of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/examples/phonon/capabilities/window.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the examples of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    4545#include <QWidget>
    4646
    47 #include <Phonon/AudioOutput>
    48 #include <Phonon/SeekSlider>
    49 #include <Phonon/MediaObject>
    50 #include <Phonon/VolumeSlider>
    51 #include <Phonon/BackendCapabilities>
    52 #include <Phonon/Effect>
    53 #include <Phonon/EffectParameter>
    54 #include <Phonon/ObjectDescriptionModel>
     47#include <phonon/audiooutput.h>
     48#include <phonon/seekslider.h>
     49#include <phonon/mediaobject.h>
     50#include <phonon/volumeslider.h>
     51#include <phonon/backendcapabilities.h>
     52#include <phonon/effect.h>
     53#include <phonon/effectparameter.h>
     54#include <phonon/objectdescriptionmodel.h>
    5555#include <QList>
    5656

  • trunk/examples/phonon/phonon.pro

    r2 r561  
    11TEMPLATE      = subdirs
    22CONFIG       += ordered
    3 SUBDIRS       = musicplayer \
     3SUBDIRS       = qmusicplayer \
    44                capabilities
    55
    … …  
    99sources.path = $$[QT_INSTALL_EXAMPLES]/phonon
    1010INSTALLS += target sources
     11
     12symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
Note: See TracChangeset for help on using the changeset viewer.