diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-19 17:14:43 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-19 17:15:56 +0100 |
| commit | d396262bc9771cacbc71e79215768984fa1974ff (patch) | |
| tree | e029399524feabed6ebe0ee1e010af9f5e58932d /src/multimedia/audio/qsound.cpp | |
| parent | 0ce2cb3ebe6289e3db14438560fa186d9e5186b8 (diff) | |
| parent | 2db2cde0d8433ad1aed59412717c4cddf496ba66 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/multimedia/doc/qtmultimedia.qdocconf
src/plugins/blackberry/mediaplayer/bbmetadata.cpp
src/plugins/blackberry/mediaplayer/bbmetadata.h
tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
Change-Id: I447c297ea15a94d1d2feb0fb5f9edac8c5d4505a
Diffstat (limited to 'src/multimedia/audio/qsound.cpp')
| -rw-r--r-- | src/multimedia/audio/qsound.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/multimedia/audio/qsound.cpp b/src/multimedia/audio/qsound.cpp index c6fae3f03..d7de822b3 100644 --- a/src/multimedia/audio/qsound.cpp +++ b/src/multimedia/audio/qsound.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -47,7 +47,7 @@ /*! \class QSound \brief The QSound class provides a method to play .wav sound files. - + \inmodule QtMultimedia \ingroup multimedia \ingroup multimedia_audio @@ -55,12 +55,12 @@ applications: asynchronously playing a sound file. This is most easily accomplished using the static play() function: - \snippet doc/src/snippets/multimedia-snippets/qsound.cpp 0 + \snippet multimedia-snippets/qsound.cpp 0 Alternatively, create a QSound object from the sound file first and then call the play() slot: - \snippet doc/src/snippets/multimedia-snippets/qsound.cpp 1 + \snippet multimedia-snippets/qsound.cpp 1 Once created a QSound object can be queried for its fileName() and total number of loops() (i.e. the number of times the sound will |