Simplify and fix spectrum build structure

It is not obvious why the example did go to quite a length to
make ffpeg a separate dynamic library. Just build it always
as a static library. The code is LGPLv2.1, but that is compatible
with the BSD-3-Clause license of the example.

Also move the actual application out of the sub-app directory
into the top level directory. This is much more intuitive to use.

Pick-to: 6.2
Change-Id: Ib6173ce21dab78d02190fb0b38c90629b41d26cd
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 0 insertions, 151 deletions

diff --git a/examples/multimedia/spectrum/app/tonegeneratordialog.cpp b/examples/multimedia/spectrum/app/tonegeneratordialog.cpp
deleted file mode 100644
index 086eba758..000000000
--- a/examples/multimedia/spectrum/app/tonegeneratordialog.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "tonegeneratordialog.h"
-#include <QComboBox>
-#include <QDialogButtonBox>
-#include <QLabel>
-#include <QPushButton>
-#include <QVBoxLayout>
-#include <QCheckBox>
-#include <QSlider>
-#include <QSpinBox>
-
-const int ToneGeneratorFreqMin = 1;
-const int ToneGeneratorFreqMax = 1000;
-const int ToneGeneratorFreqDefault = 440;
-const int ToneGeneratorAmplitudeDefault = 75;
-
-ToneGeneratorDialog::ToneGeneratorDialog(QWidget *parent)
-    :   QDialog(parent)
-    ,   m_toneGeneratorSweepCheckBox(new QCheckBox(tr("Frequency sweep"), this))
-    ,   m_frequencySweepEnabled(true)
-    ,   m_toneGeneratorControl(new QWidget(this))
-    ,   m_toneGeneratorFrequencyControl(new QWidget(this))
-    ,   m_frequencySlider(new QSlider(Qt::Horizontal, this))
-    ,   m_frequencySpinBox(new QSpinBox(this))
-    ,   m_frequency(ToneGeneratorFreqDefault)
-    ,   m_amplitudeSlider(new QSlider(Qt::Horizontal, this))
-{
-    QVBoxLayout *dialogLayout = new QVBoxLayout(this);
-
-    m_toneGeneratorSweepCheckBox->setChecked(true);
-
-    // Configure tone generator controls
-    m_frequencySlider->setRange(ToneGeneratorFreqMin, ToneGeneratorFreqMax);
-    m_frequencySlider->setValue(ToneGeneratorFreqDefault);
-    m_frequencySpinBox->setRange(ToneGeneratorFreqMin, ToneGeneratorFreqMax);
-    m_frequencySpinBox->setValue(ToneGeneratorFreqDefault);
-    m_amplitudeSlider->setRange(0, 100);
-    m_amplitudeSlider->setValue(ToneGeneratorAmplitudeDefault);
-
-    // Add widgets to layout
-    QGridLayout *frequencyControlLayout = new QGridLayout;
-    QLabel *frequencyLabel = new QLabel(tr("Frequency (Hz)"), this);
-    frequencyControlLayout->addWidget(frequencyLabel, 0, 0, 2, 1);
-    frequencyControlLayout->addWidget(m_frequencySlider, 0, 1);
-    frequencyControlLayout->addWidget(m_frequencySpinBox, 1, 1);
-    m_toneGeneratorFrequencyControl->setLayout(frequencyControlLayout);
-    m_toneGeneratorFrequencyControl->setEnabled(false);
-
-    QGridLayout *toneGeneratorLayout = new QGridLayout;
-    QLabel *amplitudeLabel = new QLabel(tr("Amplitude"), this);
-    toneGeneratorLayout->addWidget(m_toneGeneratorSweepCheckBox, 0, 1);
-    toneGeneratorLayout->addWidget(m_toneGeneratorFrequencyControl, 1, 0, 1, 2);
-    toneGeneratorLayout->addWidget(amplitudeLabel, 2, 0);
-    toneGeneratorLayout->addWidget(m_amplitudeSlider, 2, 1);
-    m_toneGeneratorControl->setLayout(toneGeneratorLayout);
-    m_toneGeneratorControl->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
-    dialogLayout->addWidget(m_toneGeneratorControl);
-
-    // Connect
-    connect(m_toneGeneratorSweepCheckBox, &QCheckBox::toggled,
-            this, &ToneGeneratorDialog::frequencySweepEnabled);
-    connect(m_frequencySlider, &QSlider::valueChanged,
-            m_frequencySpinBox, &QSpinBox::setValue);
-    connect(m_frequencySpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
-            m_frequencySlider, &QSlider::setValue);
-
-    // Add standard buttons to layout
-    QDialogButtonBox *buttonBox = new QDialogButtonBox(this);
-    buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-    dialogLayout->addWidget(buttonBox);
-
-    // Connect standard buttons
-    connect(buttonBox->button(QDialogButtonBox::Ok), &QPushButton::clicked,
-            this, &ToneGeneratorDialog::accept);
-    connect(buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked,
-            this, &ToneGeneratorDialog::reject);
-
-    setLayout(dialogLayout);
-}
-
-ToneGeneratorDialog::~ToneGeneratorDialog() = default;
-
-bool ToneGeneratorDialog::isFrequencySweepEnabled() const
-{
-    return m_toneGeneratorSweepCheckBox->isChecked();
-}
-
-qreal ToneGeneratorDialog::frequency() const
-{
-    return qreal(m_frequencySlider->value());
-}
-
-qreal ToneGeneratorDialog::amplitude() const
-{
-    return qreal(m_amplitudeSlider->value()) / 100.0;
-}
-
-void ToneGeneratorDialog::frequencySweepEnabled(bool enabled)
-{
-    m_frequencySweepEnabled = enabled;
-    m_toneGeneratorFrequencyControl->setEnabled(!enabled);
-}