diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-02-09 16:43:07 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-02-12 07:55:49 +0000 |
| commit | 1920146be1193a1136bd279f8036778e8c9c4083 (patch) | |
| tree | 2192964912baa5f7ebf2189d8788c307839739dd | |
| parent | 4a3e9ba74250e50bc1944fc6a1acb2efd2700166 (diff) | |
Fix a couple of smaller compile issues
Noted after doing a completely clean build.
Change-Id: Ie89ad1dbd86d3ac44ef65bcd22383bf1fcffabe2
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
4 files changed, 4 insertions, 5 deletions
diff --git a/examples/multimediawidgets/camera/imagesettings.h b/examples/multimediawidgets/camera/imagesettings.h index a4cbc7c9b..26b309126 100644 --- a/examples/multimediawidgets/camera/imagesettings.h +++ b/examples/multimediawidgets/camera/imagesettings.h @@ -52,8 +52,7 @@ #define IMAGESETTINGS_H #include <QDialog> -#include <QAudioEncoderSettings> -#include <QVideoEncoderSettings> +#include <QMediaEncoderSettings> QT_BEGIN_NAMESPACE class QComboBox; diff --git a/examples/multimediawidgets/camera/videosettings.h b/examples/multimediawidgets/camera/videosettings.h index 35970d150..2cb690d27 100644 --- a/examples/multimediawidgets/camera/videosettings.h +++ b/examples/multimediawidgets/camera/videosettings.h @@ -52,8 +52,7 @@ #define VIDEOSETTINGS_H #include <QDialog> -#include <QAudioEncoderSettings> -#include <QVideoEncoderSettings> +#include <QMediaEncoderSettings> QT_BEGIN_NAMESPACE class QComboBox; diff --git a/src/multimedia/audio/qwavedecoder.cpp b/src/multimedia/audio/qwavedecoder.cpp index d90322068..1507087df 100644 --- a/src/multimedia/audio/qwavedecoder.cpp +++ b/src/multimedia/audio/qwavedecoder.cpp @@ -41,6 +41,8 @@ #include <QtCore/qtimer.h> #include <QtCore/qendian.h> +#include <limits.h> +#include <qdebug.h> QT_BEGIN_NAMESPACE diff --git a/tests/auto/unit/qml/qdeclarativeaudio/tst_qdeclarativeaudio.cpp b/tests/auto/unit/qml/qdeclarativeaudio/tst_qdeclarativeaudio.cpp index 2e7ee9c17..1ceedd009 100644 --- a/tests/auto/unit/qml/qdeclarativeaudio/tst_qdeclarativeaudio.cpp +++ b/tests/auto/unit/qml/qdeclarativeaudio/tst_qdeclarativeaudio.cpp @@ -613,7 +613,6 @@ void tst_QDeclarativeAudio::metaData() QFETCH(QVariant, value); QDeclarativeAudio audio; - auto *service = mockIntegration->lastPlayerService(); audio.classBegin(); audio.componentComplete(); |