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, 105 deletions

diff --git a/src/datavisualizationqml2/glstatestore_p.h b/src/datavisualizationqml2/glstatestore_p.h
deleted file mode 100644
index f5aa0bdd..00000000
--- a/src/datavisualizationqml2/glstatestore_p.h
+++ /dev/null
@@ -1,105 +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 GLSTATESTORE_P_H
-#define GLSTATESTORE_P_H
-
-#include <QtGui/QOpenGLFunctions>
-#include <QtCore/QScopedArrayPointer>
-#include "enumtostringmap_p.h"
-
-class GLStateStore : public QObject, protected QOpenGLFunctions
-{
-    Q_OBJECT
-public:
-    explicit GLStateStore(QOpenGLContext *context, QObject *parent = 0);
-    ~GLStateStore();
-
-    void storeGLState();
-    void restoreGLState();
-    void initGLDefaultState();
-
-#ifdef VERBOSE_STATE_STORE
-    void printCurrentState(bool in);
-    EnumToStringMap *m_map;
-#endif
-
-    GLint m_scissorBox[4];
-    GLboolean m_isScissorTestEnabled;
-
-#if !QT_CONFIG(opengles2)
-    GLint m_drawFramebuffer;
-    GLint m_readFramebuffer;
-    GLint m_renderbuffer;
-#endif
-    GLfloat m_clearColor[4];
-    GLfloat m_clearDepth;
-    GLboolean m_isBlendingEnabled;
-    GLboolean m_isDepthTestEnabled;
-    GLint m_depthFunc;
-    GLboolean m_isDepthWriteEnabled;
-    GLint m_currentProgram;
-    GLint m_maxVertexAttribs;
-    QScopedArrayPointer<GLint> m_vertexAttribArrayEnabledStates;
-    QScopedArrayPointer<GLint> m_vertexAttribArrayBoundBuffers;
-    QScopedArrayPointer<GLint> m_vertexAttribArraySizes;
-    QScopedArrayPointer<GLint> m_vertexAttribArrayTypes;
-    QScopedArrayPointer<GLint> m_vertexAttribArrayNormalized;
-    QScopedArrayPointer<GLint> m_vertexAttribArrayStrides;
-    QScopedArrayPointer<void *> m_vertexAttribArrayOffsets;
-
-    GLint m_activeTexture;
-    GLint m_texBinding2D;
-    GLint m_frontFace;
-    GLboolean m_isCullFaceEnabled;
-    GLint m_cullFaceMode;
-    GLint m_blendEquationRGB;
-    GLint m_blendEquationAlpha;
-    GLint m_blendDestAlpha;
-    GLint m_blendDestRGB;
-    GLint m_blendSrcAlpha;
-    GLint m_blendSrcRGB;
-    GLint m_boundArrayBuffer;
-    GLint m_boundElementArrayBuffer;
-    GLboolean m_polygonOffsetFillEnabled;
-    GLfloat m_polygonOffsetFactor;
-    GLfloat m_polygonOffsetUnits;
-};
-
-#endif