diff options
author | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:30:40 +0200 |
---|---|---|
committer | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:31:31 +0200 |
commit | fb8d5f300ea30689674ce1b461b7f8d636a26332 (patch) | |
tree | a7dcf294ecd847b9e5fd8eccd831a40defce5b43 /examples/multimedia/spectrum/app/engine.h | |
parent | 1f2427642d2aa2e11318f7e5f968fb563f40d24b (diff) | |
parent | 2db2cde0d8433ad1aed59412717c4cddf496ba66 (diff) |
Merge branch 'stable' into release
Change-Id: I21911e86a651caa599110317a5e677cd61db4e86
Diffstat (limited to 'examples/multimedia/spectrum/app/engine.h')
-rw-r--r-- | examples/multimedia/spectrum/app/engine.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/multimedia/spectrum/app/engine.h b/examples/multimedia/spectrum/app/engine.h index f3ca5c97a..014492869 100644 --- a/examples/multimedia/spectrum/app/engine.h +++ b/examples/multimedia/spectrum/app/engine.h @@ -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 examples of the Qt Toolkit. @@ -68,7 +68,7 @@ class QAudioOutput; QT_END_NAMESPACE /** - * This class interfaces with the QtMultimedia audio classes, and also with + * This class interfaces with the Qt Multimedia audio classes, and also with * the SpectrumAnalyser class. Its role is to manage the capture and playback * of audio data, meanwhile performing real-time analysis of the audio level * and frequency spectrum. |