diff options
| author | Lorn Potter <lorn.potter@gmail.com> | 2023-03-28 11:12:49 +1000 |
|---|---|---|
| committer | Lorn Potter <lorn.potter@gmail.com> | 2023-03-28 20:06:19 +0000 |
| commit | 8ffad74e143afbdead0ad1f6da60ccd69315fea2 (patch) | |
| tree | 722f1f6c70c77eade29b731263703f580c3f30db | |
| parent | 3fb7aac993e99a35a89e019185c0ed05991c1bf2 (diff) | |
| download | qtmultimedia-8ffad74e143afbdead0ad1f6da60ccd69315fea2.tar.gz | |
wasm: fix build of examples with qmake
Modern qmake does not need to include moc files.
These were creating moc_ files in the source directory causing
duplicate symbols in static build such as wasm.
Fixes: QTBUG-112315
Pick-to: 6.5
Change-Id: I9881c1b0d79cf453c742fc68ec56ff1843a3adab
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
| -rw-r--r-- | examples/multimedia/audiodecoder/audiodecoder.cpp | 1 | ||||
| -rw-r--r-- | examples/multimedia/audiorecorder/audiolevel.cpp | 1 | ||||
| -rw-r--r-- | examples/multimedia/audiorecorder/audiorecorder.cpp | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/examples/multimedia/audiodecoder/audiodecoder.cpp b/examples/multimedia/audiodecoder/audiodecoder.cpp index 40c613708..e14834a3a 100644 --- a/examples/multimedia/audiodecoder/audiodecoder.cpp +++ b/examples/multimedia/audiodecoder/audiodecoder.cpp @@ -160,4 +160,3 @@ void AudioDecoder::updateProgress() } } -#include "moc_audiodecoder.cpp" diff --git a/examples/multimedia/audiorecorder/audiolevel.cpp b/examples/multimedia/audiorecorder/audiolevel.cpp index 2a84ff287..444dca9a4 100644 --- a/examples/multimedia/audiorecorder/audiolevel.cpp +++ b/examples/multimedia/audiorecorder/audiolevel.cpp @@ -31,4 +31,3 @@ void AudioLevel::paintEvent(QPaintEvent *event) painter.fillRect(widthLevel, 0, width(), height(), Qt::black); } -#include "moc_audiolevel.cpp" diff --git a/examples/multimedia/audiorecorder/audiorecorder.cpp b/examples/multimedia/audiorecorder/audiorecorder.cpp index 8d97ce705..f529dd3e6 100644 --- a/examples/multimedia/audiorecorder/audiorecorder.cpp +++ b/examples/multimedia/audiorecorder/audiorecorder.cpp @@ -295,4 +295,3 @@ void AudioRecorder::processBuffer(const QAudioBuffer &buffer) m_audioLevels.at(i)->setLevel(levels.at(i)); } -#include "moc_audiorecorder.cpp" |