Drop qquickdummyregistration_p.h

We can do the same thing with PAST_MAJOR_VERSIONS these days and it's
cleaner and faster.

Amends commit b47e26d29db05ecf87f74815e37e0bf7394d06ba.

Task-number: QTBUG-85151
Change-Id: I2768b88b1a5ca26b62b3d40421fe897d89c1fdcf
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit d7a18de36c545fdc5a11138773f6cc8ac53a8f00)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

2 files changed, 1 insertions, 72 deletions

diff --git a/src/quickcontrols2/CMakeLists.txt b/src/quickcontrols2/CMakeLists.txt
index 77659a2a45..9a865c272c 100644
--- a/src/quickcontrols2/CMakeLists.txt
+++ b/src/quickcontrols2/CMakeLists.txt
@@ -5,6 +5,7 @@
 qt_internal_add_qml_module(QuickControls2
     URI "QtQuick.Controls"
     VERSION "${PROJECT_VERSION}"
+    PAST_MAJOR_VERSIONS 2
     DESIGNER_SUPPORTED
     CLASS_NAME QtQuickControls2Plugin
     PLUGIN_TARGET qtquickcontrols2plugin
@@ -21,7 +22,6 @@ qt_internal_add_qml_module(QuickControls2
     NO_PLUGIN_OPTIONAL
     NO_GENERATE_PLUGIN_SOURCE
     SOURCES
-        qquickdummyregistration_p.h
         qquickstyle.cpp qquickstyle.h qquickstyle_p.h
         qquickstyleplugin.cpp qquickstyleplugin_p.h
         qtquickcontrols2global.h
diff --git a/src/quickcontrols2/qquickdummyregistration_p.h b/src/quickcontrols2/qquickdummyregistration_p.h
deleted file mode 100644
index 0d3b34a847..0000000000
--- a/src/quickcontrols2/qquickdummyregistration_p.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQUICKDUMMYREGISTRATION_H
-#define QQUICKDUMMYREGISTRATION_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt 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.
-//
-
-#include <QtQml/qqml.h>
-// Ensure that the generated qmltyperegistrations .cpp file includes this header
-// by including it here. Otherwise, the qtquickcontrols2plugin will fail to load
-// due to the type registration function's symbol being undefined.
-#include <QtQuickControls2/qtquickcontrols2global.h>
-
-QT_BEGIN_NAMESPACE
-
-// QtQuick.Controls has no types, so if we didn't have this dummy type,
-// we'd have no way of specifying the version when the module was added,
-// and 6.0 would be the only version that gets registered: QTBUG-85151
-struct QQuickDummyType
-{
-    Q_GADGET
-    QML_ANONYMOUS
-    QML_ADDED_IN_VERSION(2, 0)
-};
-
-QT_END_NAMESPACE
-
-#endif // QQUICKDUMMYREGISTRATION_H