diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:30:02 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:30:02 +0100 |
| commit | b11ec513d9d9410dc46737005020479340cad9a2 (patch) | |
| tree | 612c25b785a6c160e40c6485feb0d2f2ff6b4c2f /examples | |
| parent | 42932e1a9dfd6699763b336f552e46f9b1ff30c9 (diff) | |
| parent | 4e8e47989d96f8d60feec2187e4d9c85adb19c2a (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: Icf8b9f73c50b16d6f5765040eb7bd918231df94a
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/multimedia/spectrum/app/wavfile.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/examples/multimedia/spectrum/app/wavfile.cpp b/examples/multimedia/spectrum/app/wavfile.cpp index b0a3ffccc..475200db5 100644 --- a/examples/multimedia/spectrum/app/wavfile.cpp +++ b/examples/multimedia/spectrum/app/wavfile.cpp @@ -49,9 +49,6 @@ ****************************************************************************/ #include <qendian.h> -#include <QVector> -#include <QDebug> -#include "utils.h" #include "wavfile.h" struct chunk @@ -109,7 +106,7 @@ const QAudioFormat &WavFile::fileFormat() const qint64 WavFile::headerLength() const { -return m_headerLength; + return m_headerLength; } bool WavFile::readHeader() |