diff options
Diffstat (limited to 'tests/auto/corelib/plugin/qpluginloader/staticplugin')
4 files changed, 6 insertions, 61 deletions
diff --git a/tests/auto/corelib/plugin/qpluginloader/staticplugin/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/staticplugin/.prev_CMakeLists.txt deleted file mode 100644 index bfc30d7c1d..0000000000 --- a/tests/auto/corelib/plugin/qpluginloader/staticplugin/.prev_CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ -# Generated from staticplugin.pro. - -##################################################################### -## staticplugin Generic Library: -##################################################################### - -add_cmake_library(staticplugin - STATIC - SOURCES - main.cpp - PUBLIC_LIBRARIES - Qt::Core - MOC_OPTIONS - "-M" - "ExtraMetaData=StaticPlugin" - "-M" - "ExtraMetaData=foo" -) - -#### Keys ignored in scope 1:.:.:staticplugin.pro:<TRUE>: -# TEMPLATE = "lib" - -qt_autogen_tools_initial_setup(staticplugin) diff --git a/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt index 0eb42728f4..647c8ac207 100644 --- a/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt @@ -1,14 +1,15 @@ -# Generated from staticplugin.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## staticplugin Generic Library: ##################################################################### -qt_add_cmake_library(staticplugin +qt_internal_add_cmake_library(staticplugin STATIC SOURCES main.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Core MOC_OPTIONS "-M" @@ -17,7 +18,6 @@ qt_add_cmake_library(staticplugin "ExtraMetaData=foo" ) -#### Keys ignored in scope 1:.:.:staticplugin.pro:<TRUE>: # TEMPLATE = "lib" qt_autogen_tools_initial_setup(staticplugin) diff --git a/tests/auto/corelib/plugin/qpluginloader/staticplugin/main.cpp b/tests/auto/corelib/plugin/qpluginloader/staticplugin/main.cpp index 6d163ea336..208096b425 100644 --- a/tests/auto/corelib/plugin/qpluginloader/staticplugin/main.cpp +++ b/tests/auto/corelib/plugin/qpluginloader/staticplugin/main.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 Intel Corporation. -** 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) 2018 Intel Corporation. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtPlugin> #include <QObject> diff --git a/tests/auto/corelib/plugin/qpluginloader/staticplugin/staticplugin.pro b/tests/auto/corelib/plugin/qpluginloader/staticplugin/staticplugin.pro deleted file mode 100644 index ff65ab728c..0000000000 --- a/tests/auto/corelib/plugin/qpluginloader/staticplugin/staticplugin.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = lib -CONFIG += plugin static -SOURCES = main.cpp -QT = core - -# Add extra metadata to the plugin -QMAKE_MOC_OPTIONS += -M ExtraMetaData=StaticPlugin -M ExtraMetaData=foo |