diff options
Diffstat (limited to 'tests/auto/qml/qqmlmoduleplugin/pluginVersion')
3 files changed, 7 insertions, 53 deletions
diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt deleted file mode 100644 index 4a98877528..0000000000 --- a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ -# Generated from pluginVersion.pro. - -##################################################################### -## pluginVersion Generic Library: -##################################################################### - -qt_internal_add_cmake_library(pluginVersion - MODULE - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlVersionPluginType" - SOURCES - plugin.cpp - PUBLIC_LIBRARIES - Qt::Core - Qt::CorePrivate - Qt::GuiPrivate - Qt::Qml - Qt::QmlPrivate -) - -#### Keys ignored in scope 1:.:.:pluginVersion.pro:<TRUE>: -# IMPORT_FILES = "qmldir" -# TEMPLATE = "lib" - -qt_autogen_tools_initial_setup(pluginVersion) diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt index e3be81a837..4afc872f7a 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from pluginVersion.pro. ##################################################################### @@ -9,7 +12,7 @@ qt_internal_add_cmake_library(pluginVersion OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlVersionPluginType" SOURCES plugin.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Core Qt::CorePrivate Qt::GuiPrivate diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/plugin.cpp b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/plugin.cpp index 470da6c35f..26d9977f7d 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/plugin.cpp +++ b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/plugin.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QStringList> #include <QtQml/qqmlextensionplugin.h> #include <QtQml/qqml.h> @@ -50,7 +25,7 @@ public: { } - void registerTypes(const char *uri) + void registerTypes(const char *uri) override { Q_ASSERT(QLatin1String(uri) == "org.qtproject.AutoTestQmlVersionPluginType"); qmlRegisterType<FloorPluginType>(uri, 1, 4, "Floor"); |