Qt Charts project file structure change

Charts repository structure is changed to follow the structure of a
Qt Add-On module. The task includes following changes:

- All macros and definitions named 'commercial' have been renamed.
- Compile errors related to QString and qSort usage have been fixed.
- Old demos are moved under examples. The QML examples now support only
  Qt Quick 2.0, the support for Qt Quick 1 is removed.
- The QML examples with multiple views are updated so that they are
  usable also with touch devices.
- Unnecessary version checks are removed from examples.
- The build stamp has been removed as it was only meant for Charts
  development purposes and it's no longer needed. Also development
  build related debug prints are removed as __DATE__ can't be used
  for all OS thus it doesn't make much sense.
- Documentation structure has been updated based on the new module
  structure. The raw HTML files have been removed. Demos are
  combined to examples.
- Unnecessary .qdocinc files are no longer needed. The content is
  moved to the corresponding .cpp files.
- The Charts widget designer plugin is updated according to the module
  change.
- The test cases updated according to the project structure change.
  Tests are added also for version 2.0.
- cmake modules generation is not needed with Qt 5.4 and Qt Charts
  so it's disabled.
- The new module name and version are updated to the plugin.qmltypes
  file.

Task-number: QTRD-2844, QTRD-3217, QTRD-3218, QTRD-3277, QTRD-3228,
QTRD-2526, QTRD-3233, QTRD-3222

Change-Id: Ib7fb26057cde710ffaf6bc780c8bf52a16f45160
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

12 files changed, 0 insertions, 655 deletions

diff --git a/demos/quick2oscilloscope/datasource.cpp b/demos/quick2oscilloscope/datasource.cpp
deleted file mode 100644
index 48b2ecfb..00000000
--- a/demos/quick2oscilloscope/datasource.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "datasource.h"
-#include <QXYSeries>
-#include <QAreaSeries>
-#include <QtQuick/QQuickView>
-#include <QtQuick/QQuickItem>
-#include <QDebug>
-#include <qmath.h>
-
-QTCOMMERCIALCHART_USE_NAMESPACE
-
-Q_DECLARE_METATYPE(QAbstractSeries *)
-Q_DECLARE_METATYPE(QAbstractAxis *)
-
-DataSource::DataSource(QQuickView *appViewer, QObject *parent) :
-    QObject(parent),
-    m_appViewer(appViewer),
-    m_index(-1)
-{
-    qRegisterMetaType<QAbstractSeries*>();
-    qRegisterMetaType<QAbstractAxis*>();
-
-    generateData(0, 5, 1024);
-}
-
-void DataSource::update(QAbstractSeries *series)
-{
-    if (series) {
-        QXYSeries *xySeries = static_cast<QXYSeries *>(series);
-        m_index++;
-        if (m_index > m_data.count() - 1)
-            m_index = 0;
-
-        QList<QPointF> points = m_data.at(m_index);
-        // Use replace instead of clear + append, it's optimized for performance
-        xySeries->replace(points);
-    }
-}
-
-void DataSource::generateData(int type, int rowCount, int colCount)
-{
-    // Remove previous data
-    foreach (QList<QPointF> row, m_data)
-        row.clear();
-    m_data.clear();
-
-    // Append the new data depending on the type
-    for (int i(0); i < rowCount; i++) {
-        QList<QPointF> points;
-        for (int j(0); j < colCount; j++) {
-            qreal x(0);
-            qreal y(0);
-            switch (type) {
-            case 0:
-                // data with sin + random component
-                y = qSin(3.14159265358979 / 50 * j) + 0.5 + (qreal) rand() / (qreal) RAND_MAX;
-                x = j;
-                break;
-            case 1:
-                // linear data
-                x = j;
-                y = (qreal) i / 10;
-                break;
-            default:
-                // unknown, do nothing
-                break;
-            }
-            points.append(QPointF(x, y));
-        }
-        m_data.append(points);
-    }
-}
diff --git a/demos/quick2oscilloscope/datasource.h b/demos/quick2oscilloscope/datasource.h
deleted file mode 100644
index 3670a7d5..00000000
--- a/demos/quick2oscilloscope/datasource.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef DATASOURCE_H
-#define DATASOURCE_H
-
-#include <QObject>
-#include <QAbstractSeries>
-
-class QQuickView;
-
-QTCOMMERCIALCHART_USE_NAMESPACE
-
-class DataSource : public QObject
-{
-    Q_OBJECT
-public:
-    explicit DataSource(QQuickView *appViewer, QObject *parent = 0);
-
-signals:
-
-public slots:
-    void generateData(int type, int rowCount, int colCount);
-    void update(QAbstractSeries *series);
-
-private:
-    QQuickView *m_appViewer;
-    QList<QList<QPointF> > m_data;
-    int m_index;
-};
-
-#endif // DATASOURCE_H
diff --git a/demos/quick2oscilloscope/main.cpp b/demos/quick2oscilloscope/main.cpp
deleted file mode 100644
index 1d733c9b..00000000
--- a/demos/quick2oscilloscope/main.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets/QApplication>
-#include <QtQuick/QQuickItem>
-#include <QtQml/QQmlContext>
-#include <QtQml/QQmlEngine>
-#include <QDir>
-#include "qtquick2applicationviewer.h"
-#include "datasource.h"
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-
-    QtQuick2ApplicationViewer viewer;
-#ifdef Q_OS_ANDROID
-    viewer.addImportPath(QString::fromLatin1("assets:/qml"));
-    viewer.engine()->addPluginPath(QString::fromLatin1("%1/../%2").arg(QDir::homePath(), QString::fromLatin1("lib")));
-#else
-    viewer.addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QString::fromLatin1("qml")));
-#endif
-
-    DataSource dataSource(&viewer);
-    viewer.rootContext()->setContextProperty("dataSource", &dataSource);
-
-    viewer.setSource(QUrl("qrc:/qml/quick2oscilloscope/main.qml"));
-    viewer.showExpanded();
-
-    return app.exec();
-}
diff --git a/demos/quick2oscilloscope/qml/quick2oscilloscope/ControlPanel.qml b/demos/quick2oscilloscope/qml/quick2oscilloscope/ControlPanel.qml
deleted file mode 100644
index 74041410..00000000
--- a/demos/quick2oscilloscope/qml/quick2oscilloscope/ControlPanel.qml
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Column {
-    spacing: 8
-    signal animationsEnabled(bool enabled)
-    signal seriesTypeChanged(string type)
-    signal refreshRateChanged(variant rate);
-    signal signalSourceChanged(string source, int signalCount, int sampleCount);
-    signal antialiasingEnabled(bool enabled)
-
-    Text {
-        text: "Scope"
-        font.pointSize: 18
-        color: "white"
-    }
-
-    MultiButton {
-        text: "Graph: "
-        items: ["line", "spline", "scatter"]
-        currentSelection: 0
-        onSelectionChanged: seriesTypeChanged(items[currentSelection]);
-    }
-
-    MultiButton {
-        id: signalSourceButton
-        text: "Source: "
-        items: ["sin", "linear"]
-        currentSelection: 0
-        onSelectionChanged: signalSourceChanged(
-                                selection,
-                                5,
-                                sampleCountButton.items[sampleCountButton.currentSelection]);
-    }
-
-    MultiButton {
-        id: sampleCountButton
-        text: "Samples: "
-        items: [6, 128, 1024, 10000]
-        currentSelection: 2
-        onSelectionChanged: signalSourceChanged(
-                                signalSourceButton.items[signalSourceButton.currentSelection],
-                                5,
-                                selection);
-    }
-
-    MultiButton {
-        text: "Refresh rate: "
-        items: [1, 24, 60, 100]
-        currentSelection: 2
-        onSelectionChanged: refreshRateChanged(items[currentSelection]);
-    }
-
-    MultiButton {
-        text: "Animations: "
-        items: ["OFF", "ON"]
-        currentSelection: 0
-        onSelectionChanged: animationsEnabled(currentSelection == 1);
-    }
-
-    MultiButton {
-        text: "Antialias: "
-        items: ["OFF", "ON"]
-        currentSelection: 0
-        onSelectionChanged: antialiasingEnabled(currentSelection == 1);
-    }
-}
diff --git a/demos/quick2oscilloscope/qml/quick2oscilloscope/MultiButton.qml b/demos/quick2oscilloscope/qml/quick2oscilloscope/MultiButton.qml
deleted file mode 100644
index 072e8019..00000000
--- a/demos/quick2oscilloscope/qml/quick2oscilloscope/MultiButton.qml
+++ /dev/null
@@ -1,54 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Rectangle {
-    id: button
-    width: 115
-    height: 31
-    gradient: Gradient {
-        GradientStop { position: mouseArea.pressed ? 1.0 : 0.0; color: "#A09090" }
-        GradientStop { position: mouseArea.pressed ? 0.0 : 1.0; color: "#505050" }
-    }
-    smooth: true
-
-    radius: 7
-    property string text: "Option: "
-    property variant items: ["first"]
-    property int currentSelection: 0
-    signal selectionChanged(variant selection)
-
-    Text {
-        id: buttonText
-        anchors.centerIn: parent
-        color: "#FFFFFF"
-        text: button.text + button.items[currentSelection]
-    }
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        onClicked: {
-            currentSelection = (currentSelection + 1) % items.length;
-            selectionChanged(button.items[currentSelection]);
-        }
-    }
-}
diff --git a/demos/quick2oscilloscope/qml/quick2oscilloscope/ScopeView.qml b/demos/quick2oscilloscope/qml/quick2oscilloscope/ScopeView.qml
deleted file mode 100644
index bdab2604..00000000
--- a/demos/quick2oscilloscope/qml/quick2oscilloscope/ScopeView.qml
+++ /dev/null
@@ -1,116 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtCommercial.Chart 1.2
-
-//![1]
-ChartView {
-    id: chartView
-    animationOptions: ChartView.NoAnimation
-    theme: ChartView.ChartThemeDark
-
-    ValueAxis {
-        id: axisY1
-        min: -1
-        max: 4
-    }
-
-    ValueAxis {
-        id: axisY2
-        min: -10
-        max: 5
-    }
-
-    ValueAxis {
-        id: axisX
-        min: 0
-        max: 1000
-    }
-
-    LineSeries {
-        id: lineSeries1
-        name: "signal 1"
-        axisX: axisX
-        axisY: axisY1
-    }
-    LineSeries {
-        id: lineSeries2
-        name: "signal 2"
-        axisX: axisX
-        axisYRight: axisY2
-    }
-// ...
-//![1]
-
-    //![2]
-    Timer {
-        id: refreshTimer
-        interval: 1 / 60 * 1000 // 60 Hz
-        running: true
-        repeat: true
-        onTriggered: {
-            dataSource.update(chartView.series(0));
-            dataSource.update(chartView.series(1));
-        }
-    }
-    //![2]
-
-    //![3]
-    function changeSeriesType(type) {
-        chartView.removeAllSeries();
-
-        // Create two new series of the correct type. Axis x is the same for both of the series,
-        // but the series have their own y-axes to make it possible to control the y-offset
-        // of the "signal sources".
-        if (type == "line") {
-            chartView.createSeries(ChartView.SeriesTypeLine, "signal 1", axisX, axisY1);
-            chartView.createSeries(ChartView.SeriesTypeLine, "signal 2", axisX, axisY2);
-        } else if (type == "spline") {
-            chartView.createSeries(ChartView.SeriesTypeSpline, "signal 1", axisX, axisY1);
-            chartView.createSeries(ChartView.SeriesTypeSpline, "signal 2", axisX, axisY2);
-        } else {
-            var series1 = chartView.createSeries(ChartView.SeriesTypeScatter, "signal 1", axisX, axisY1);
-            series1.markerSize = 3;
-            series1.borderColor = "transparent";
-            var series2 = chartView.createSeries(ChartView.SeriesTypeScatter, "signal 2", axisX, axisY2);
-            series2.markerSize = 3;
-            series2.borderColor = "transparent";
-        }
-    }
-
-    function createAxis(min, max) {
-        // The following creates a ValueAxis object that can be then set as a x or y axis for a series
-        return Qt.createQmlObject("import QtQuick 1.1; import QtCommercial.Chart 1.1; ValueAxis { min: "
-                                  + min + "; max: " + max + " }", chartView);
-    }
-    //![3]
-
-    function setAnimations(enabled) {
-        if (enabled)
-            chartView.animationOptions = ChartView.SeriesAnimations;
-        else
-            chartView.animationOptions = ChartView.NoAnimation;
-    }
-
-    function changeRefreshRate(rate) {
-        refreshTimer.interval = 1 / Number(rate) * 1000;
-    }
-}
diff --git a/demos/quick2oscilloscope/qml/quick2oscilloscope/main.qml b/demos/quick2oscilloscope/qml/quick2oscilloscope/main.qml
deleted file mode 100644
index 8b00f355..00000000
--- a/demos/quick2oscilloscope/qml/quick2oscilloscope/main.qml
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//![3]
-import QtQuick 2.0
-//![3]
-
-//![1]
-Rectangle {
-    id: main
-    width: 400
-    height: 300
-    color: "#404040"
-
-    ControlPanel {
-        id: controlPanel
-        anchors.top: parent.top
-        anchors.topMargin: 10
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.leftMargin: 10
-// ...
-//![1]
-
-        onSignalSourceChanged: {
-            if (source == "sin")
-                dataSource.generateData(0, signalCount, sampleCount);
-            else
-                dataSource.generateData(1, signalCount, sampleCount);
-        }
-        onAnimationsEnabled: scopeView.setAnimations(enabled);
-        onSeriesTypeChanged: scopeView.changeSeriesType(type);
-        onRefreshRateChanged: scopeView.changeRefreshRate(rate);
-        onAntialiasingEnabled: scopeView.antialiasing = enabled;
-    }
-
-//![2]
-    ScopeView {
-        id: scopeView
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        anchors.right: parent.right
-        anchors.left: controlPanel.right
-        height: main.height
-    }
-//![2]
-}
diff --git a/demos/quick2oscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.cpp b/demos/quick2oscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.cpp
deleted file mode 100644
index b58190f6..00000000
--- a/demos/quick2oscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// checksum 0xc01f version 0x90005
-/*
-  This file was generated by the Qt Quick 2 Application wizard of Qt Creator.
-  QtQuick2ApplicationViewer is a convenience class containing mobile device specific
-  code such as screen orientation handling. Also QML paths and debugging are
-  handled here.
-  It is recommended not to modify this file, since newer versions of Qt Creator
-  may offer an updated version of it.
-*/
-
-#include "qtquick2applicationviewer.h"
-
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
-#include <QtQml/QQmlEngine>
-
-class QtQuick2ApplicationViewerPrivate
-{
-    QString mainQmlFile;
-    friend class QtQuick2ApplicationViewer;
-    static QString adjustPath(const QString &path);
-};
-
-QString QtQuick2ApplicationViewerPrivate::adjustPath(const QString &path)
-{
-#if defined(Q_OS_IOS)
-    if (!QDir::isAbsolutePath(path))
-        return QString::fromLatin1("%1/%2")
-                .arg(QCoreApplication::applicationDirPath(), path);
-#elif defined(Q_OS_MAC)
-    if (!QDir::isAbsolutePath(path))
-        return QString::fromLatin1("%1/../Resources/%2")
-                .arg(QCoreApplication::applicationDirPath(), path);
-#elif defined(Q_OS_BLACKBERRY)
-    if (!QDir::isAbsolutePath(path))
-        return QString::fromLatin1("app/native/%1").arg(path);
-#elif !defined(Q_OS_ANDROID)
-    QString pathInInstallDir =
-            QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
-    if (QFileInfo(pathInInstallDir).exists())
-        return pathInInstallDir;
-    pathInInstallDir =
-            QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), path);
-    if (QFileInfo(pathInInstallDir).exists())
-        return pathInInstallDir;
-#elif defined(Q_OS_ANDROID_NO_SDK)
-    return QLatin1String("/data/user/qt/") + path;
-#endif
-    return path;
-}
-
-QtQuick2ApplicationViewer::QtQuick2ApplicationViewer(QWindow *parent)
-    : QQuickView(parent)
-    , d(new QtQuick2ApplicationViewerPrivate())
-{
-    connect(engine(), SIGNAL(quit()), SLOT(close()));
-    setResizeMode(QQuickView::SizeRootObjectToView);
-}
-
-QtQuick2ApplicationViewer::~QtQuick2ApplicationViewer()
-{
-    delete d;
-}
-
-void QtQuick2ApplicationViewer::setMainQmlFile(const QString &file)
-{
-    d->mainQmlFile = QtQuick2ApplicationViewerPrivate::adjustPath(file);
-#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK)
-    setSource(QUrl(QLatin1String("assets:/")+d->mainQmlFile));
-#else
-    setSource(QUrl::fromLocalFile(d->mainQmlFile));
-#endif
-}
-
-void QtQuick2ApplicationViewer::addImportPath(const QString &path)
-{
-    engine()->addImportPath(QtQuick2ApplicationViewerPrivate::adjustPath(path));
-}
-
-void QtQuick2ApplicationViewer::showExpanded()
-{
-#if defined(Q_WS_SIMULATOR) || defined(Q_OS_QNX)
-    showFullScreen();
-#else
-    show();
-#endif
-}
diff --git a/demos/quick2oscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.h b/demos/quick2oscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.h
deleted file mode 100644
index cf66f140..00000000
--- a/demos/quick2oscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// checksum 0xfde6 version 0x90005
-/*
-  This file was generated by the Qt Quick 2 Application wizard of Qt Creator.
-  QtQuick2ApplicationViewer is a convenience class containing mobile device specific
-  code such as screen orientation handling. Also QML paths and debugging are
-  handled here.
-  It is recommended not to modify this file, since newer versions of Qt Creator
-  may offer an updated version of it.
-*/
-
-#ifndef QTQUICK2APPLICATIONVIEWER_H
-#define QTQUICK2APPLICATIONVIEWER_H
-
-#include <QtQuick/QQuickView>
-
-class QtQuick2ApplicationViewer : public QQuickView
-{
-    Q_OBJECT
-
-public:
-    explicit QtQuick2ApplicationViewer(QWindow *parent = 0);
-    virtual ~QtQuick2ApplicationViewer();
-
-    void setMainQmlFile(const QString &file);
-    void addImportPath(const QString &path);
-
-    void showExpanded();
-
-private:
-    class QtQuick2ApplicationViewerPrivate *d;
-};
-
-#endif // QTQUICK2APPLICATIONVIEWER_H
diff --git a/demos/quick2oscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.pri b/demos/quick2oscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.pri
deleted file mode 100644
index b2d0f51d..00000000
--- a/demos/quick2oscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.pri
+++ /dev/null
@@ -1,6 +0,0 @@
-QT += qml quick widgets
-
-SOURCES += $$PWD/qtquick2applicationviewer.cpp
-HEADERS += $$PWD/qtquick2applicationviewer.h
-INCLUDEPATH += $$PWD
-
diff --git a/demos/quick2oscilloscope/quick2oscilloscope.pro b/demos/quick2oscilloscope/quick2oscilloscope.pro
deleted file mode 100644
index 3f5575a6..00000000
--- a/demos/quick2oscilloscope/quick2oscilloscope.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-!include( ../demos.pri ) {
-    error( "Couldn't find the demos.pri file!" )
-}
-
-RESOURCES += resources.qrc
-SOURCES += main.cpp \
-           datasource.cpp
-OTHER_FILES += qml/quick2oscilloscope/*
-
-include(qtquick2applicationviewer/qtquick2applicationviewer.pri)
-
-HEADERS += \
-    datasource.h
diff --git a/demos/quick2oscilloscope/resources.qrc b/demos/quick2oscilloscope/resources.qrc
deleted file mode 100644
index 87208ca4..00000000
--- a/demos/quick2oscilloscope/resources.qrc
+++ /dev/null
@@ -1,8 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>qml/quick2oscilloscope/main.qml</file>
-        <file>qml/quick2oscilloscope/ControlPanel.qml</file>
-        <file>qml/quick2oscilloscope/ScopeView.qml</file>
-        <file>qml/quick2oscilloscope/MultiButton.qml</file>
-    </qresource>
-</RCC>