Modernize and update to latest CMake API

Use declarative registration for QML types, and separate the backing
library from the plugin. Also, bump the revision numbers to account for
Qt6 and drop the "2" from the source directory name.

Change-Id: Ib48f90ad32a3624e7c31f1d2af9fcd92f069ee7f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>

1 files changed, 0 insertions, 139 deletions

diff --git a/src/datavisualizationqml2/declarativetheme_p.h b/src/datavisualizationqml2/declarativetheme_p.h
deleted file mode 100644
index 11623406..00000000
--- a/src/datavisualizationqml2/declarativetheme_p.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Data Visualization module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the QtDataVisualization API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-
-#ifndef DECLARATIVETHEME_P_H
-#define DECLARATIVETHEME_P_H
-
-#include "datavisualizationglobal_p.h"
-#include "declarativecolor_p.h"
-#include "colorgradient_p.h"
-#include "q3dtheme_p.h"
-
-#include <QtQml/QQmlParserStatus>
-
-QT_BEGIN_NAMESPACE
-
-class DeclarativeTheme3D : public Q3DTheme, public QQmlParserStatus
-{
-    Q_OBJECT
-    Q_INTERFACES(QQmlParserStatus)
-    Q_PROPERTY(QQmlListProperty<QObject> themeChildren READ themeChildren)
-    Q_PROPERTY(QQmlListProperty<DeclarativeColor> baseColors READ baseColors)
-    Q_PROPERTY(QQmlListProperty<ColorGradient> baseGradients READ baseGradients)
-    Q_PROPERTY(ColorGradient *singleHighlightGradient READ singleHighlightGradient WRITE setSingleHighlightGradient NOTIFY singleHighlightGradientChanged)
-    Q_PROPERTY(ColorGradient *multiHighlightGradient READ multiHighlightGradient WRITE setMultiHighlightGradient NOTIFY multiHighlightGradientChanged)
-    Q_CLASSINFO("DefaultProperty", "themeChildren")
-
-public:
-    DeclarativeTheme3D(QObject *parent = 0);
-    virtual ~DeclarativeTheme3D();
-
-    QQmlListProperty<QObject> themeChildren();
-    static void appendThemeChildren(QQmlListProperty<QObject> *list, QObject *element);
-
-    QQmlListProperty<DeclarativeColor> baseColors();
-    static void appendBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list,
-                                     DeclarativeColor *color);
-    static qsizetype countBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list);
-    static DeclarativeColor *atBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list,
-                                              qsizetype index);
-    static void clearBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list);
-
-    QQmlListProperty<ColorGradient> baseGradients();
-    static void appendBaseGradientsFunc(QQmlListProperty<ColorGradient> *list,
-                                        ColorGradient *gradient);
-    static qsizetype countBaseGradientsFunc(QQmlListProperty<ColorGradient> *list);
-    static ColorGradient *atBaseGradientsFunc(QQmlListProperty<ColorGradient> *list,
-                                              qsizetype index);
-    static void clearBaseGradientsFunc(QQmlListProperty<ColorGradient> *list);
-
-    void setSingleHighlightGradient(ColorGradient *gradient);
-    ColorGradient *singleHighlightGradient() const;
-
-    void setMultiHighlightGradient(ColorGradient *gradient);
-    ColorGradient *multiHighlightGradient() const;
-
-    // From QQmlParserStatus
-    void classBegin() override;
-    void componentComplete() override;
-
-Q_SIGNALS:
-    void singleHighlightGradientChanged(ColorGradient *gradient);
-    void multiHighlightGradientChanged(ColorGradient *gradient);
-
-protected:
-    void handleTypeChange(Theme themeType);
-    void handleBaseColorUpdate();
-    void handleBaseGradientUpdate();
-    void handleSingleHLGradientUpdate();
-    void handleMultiHLGradientUpdate();
-
-    enum GradientType {
-        GradientTypeBase = 0,
-        GradientTypeSingleHL,
-        GradientTypeMultiHL
-    };
-
-private:
-    void addColor(DeclarativeColor *color);
-    QList<DeclarativeColor *> colorList();
-    void clearColors();
-    void clearDummyColors();
-
-    void addGradient(ColorGradient *gradient);
-    QList<ColorGradient *> gradientList();
-    void clearGradients();
-    void clearDummyGradients();
-
-    void setThemeGradient(ColorGradient *gradient, GradientType type);
-    QLinearGradient convertGradient(ColorGradient *gradient);
-    ColorGradient *convertGradient(const QLinearGradient &gradient);
-
-    QList<DeclarativeColor *> m_colors; // Not owned
-    QList<ColorGradient *> m_gradients; // Not owned
-    ColorGradient *m_singleHLGradient; // Not owned
-    ColorGradient *m_multiHLGradient; // Not owned
-
-    bool m_dummyGradients;
-    bool m_dummyColors;
-};
-
-QT_END_NAMESPACE
-
-#endif