diff options
Diffstat (limited to 'tests/auto/cmake/mockplugins')
22 files changed, 28 insertions, 20 deletions
diff --git a/tests/auto/cmake/mockplugins/.cmake.conf b/tests/auto/cmake/mockplugins/.cmake.conf index edb49ceeb2..10bc1fd407 100644 --- a/tests/auto/cmake/mockplugins/.cmake.conf +++ b/tests/auto/cmake/mockplugins/.cmake.conf @@ -1,3 +1 @@ -set(QT_REPO_MODULE_VERSION "6.5.0") - -set(QT_USE_SYNCQT_CPP TRUE) +set(QT_REPO_MODULE_VERSION "6.8.0") diff --git a/tests/auto/cmake/mockplugins/CMakeLists.txt b/tests/auto/cmake/mockplugins/CMakeLists.txt index 526abedec7..1bde9aedb1 100644 --- a/tests/auto/cmake/mockplugins/CMakeLists.txt +++ b/tests/auto/cmake/mockplugins/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qtsvg.pro. - cmake_minimum_required(VERSION 3.16) include(.cmake.conf) @@ -14,6 +12,8 @@ project(QtMockPlugins ) find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) +qt_internal_project_setup() + find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui Widgets Xml) qt_build_repo_begin() @@ -29,4 +29,5 @@ add_subdirectory(mock4plugin) add_subdirectory(mock5plugin) add_subdirectory(mock6plugin) +qt_build_repo_post_process() qt_build_repo_end() diff --git a/tests/auto/cmake/mockplugins/mock1plugin/CMakeLists.txt b/tests/auto/cmake/mockplugins/mock1plugin/CMakeLists.txt index ba636e6fe6..5a37ef9ea0 100644 --- a/tests/auto/cmake/mockplugins/mock1plugin/CMakeLists.txt +++ b/tests/auto/cmake/mockplugins/mock1plugin/CMakeLists.txt @@ -2,6 +2,7 @@ # SPDX-License-Identifier: BSD-3-Clause qt_internal_add_plugin(QMock1Plugin + NO_UNITY_BUILD CLASS_NAME QMock1Plugin PLUGIN_TYPE mockplugin SOURCES diff --git a/tests/auto/cmake/mockplugins/mock1plugin/qmock1plugin.h b/tests/auto/cmake/mockplugins/mock1plugin/qmock1plugin.h index 192b8c0591..324d0c38f4 100644 --- a/tests/auto/cmake/mockplugins/mock1plugin/qmock1plugin.h +++ b/tests/auto/cmake/mockplugins/mock1plugin/qmock1plugin.h @@ -1,5 +1,5 @@ // Copyright (C) 2018 Kitware, Inc. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef QMOCK1PLUGIN_H #define QMOCK1PLUGIN_H diff --git a/tests/auto/cmake/mockplugins/mock2plugin/CMakeLists.txt b/tests/auto/cmake/mockplugins/mock2plugin/CMakeLists.txt index acdcd7d7e2..f2705335f5 100644 --- a/tests/auto/cmake/mockplugins/mock2plugin/CMakeLists.txt +++ b/tests/auto/cmake/mockplugins/mock2plugin/CMakeLists.txt @@ -2,6 +2,7 @@ # SPDX-License-Identifier: BSD-3-Clause qt_internal_add_plugin(QMock2Plugin + NO_UNITY_BUILD CLASS_NAME QMock2Plugin PLUGIN_TYPE mockplugin SOURCES diff --git a/tests/auto/cmake/mockplugins/mock2plugin/qmock2plugin.h b/tests/auto/cmake/mockplugins/mock2plugin/qmock2plugin.h index 4d3765f28c..a1217ff4d6 100644 --- a/tests/auto/cmake/mockplugins/mock2plugin/qmock2plugin.h +++ b/tests/auto/cmake/mockplugins/mock2plugin/qmock2plugin.h @@ -1,5 +1,5 @@ // Copyright (C) 2018 Kitware, Inc. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef QMOCK2PLUGIN_H #define QMOCK2PLUGIN_H diff --git a/tests/auto/cmake/mockplugins/mock3plugin/CMakeLists.txt b/tests/auto/cmake/mockplugins/mock3plugin/CMakeLists.txt index 8b8333d2cb..b165353b24 100644 --- a/tests/auto/cmake/mockplugins/mock3plugin/CMakeLists.txt +++ b/tests/auto/cmake/mockplugins/mock3plugin/CMakeLists.txt @@ -2,6 +2,7 @@ # SPDX-License-Identifier: BSD-3-Clause qt_internal_add_plugin(QMock3Plugin + NO_UNITY_BUILD CLASS_NAME QMock3Plugin PLUGIN_TYPE mockplugin SOURCES diff --git a/tests/auto/cmake/mockplugins/mock3plugin/qmock3plugin.h b/tests/auto/cmake/mockplugins/mock3plugin/qmock3plugin.h index 8143c06c43..3e152784e0 100644 --- a/tests/auto/cmake/mockplugins/mock3plugin/qmock3plugin.h +++ b/tests/auto/cmake/mockplugins/mock3plugin/qmock3plugin.h @@ -1,5 +1,5 @@ // Copyright (C) 2018 Kitware, Inc. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef QMOCK3PLUGIN_H #define QMOCK3PLUGIN_H diff --git a/tests/auto/cmake/mockplugins/mock4plugin/CMakeLists.txt b/tests/auto/cmake/mockplugins/mock4plugin/CMakeLists.txt index b988e9b77f..cf09fb294b 100644 --- a/tests/auto/cmake/mockplugins/mock4plugin/CMakeLists.txt +++ b/tests/auto/cmake/mockplugins/mock4plugin/CMakeLists.txt @@ -2,6 +2,7 @@ # SPDX-License-Identifier: BSD-3-Clause qt_internal_add_plugin(QMock4Plugin + NO_UNITY_BUILD CLASS_NAME QMock4Plugin PLUGIN_TYPE mockplugin DEFAULT_IF FALSE diff --git a/tests/auto/cmake/mockplugins/mock4plugin/qmock4plugin.h b/tests/auto/cmake/mockplugins/mock4plugin/qmock4plugin.h index 3aad9a6cae..1895367575 100644 --- a/tests/auto/cmake/mockplugins/mock4plugin/qmock4plugin.h +++ b/tests/auto/cmake/mockplugins/mock4plugin/qmock4plugin.h @@ -1,5 +1,5 @@ // Copyright (C) 2018 Kitware, Inc. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef QMOCK4PLUGIN_H #define QMOCK4PLUGIN_H diff --git a/tests/auto/cmake/mockplugins/mock5plugin/CMakeLists.txt b/tests/auto/cmake/mockplugins/mock5plugin/CMakeLists.txt index 1bd671e97c..1d34cabe1f 100644 --- a/tests/auto/cmake/mockplugins/mock5plugin/CMakeLists.txt +++ b/tests/auto/cmake/mockplugins/mock5plugin/CMakeLists.txt @@ -2,6 +2,7 @@ # SPDX-License-Identifier: BSD-3-Clause qt_internal_add_plugin(QMock5Plugin + NO_UNITY_BUILD CLASS_NAME QMock5Plugin PLUGIN_TYPE mockplugin DEFAULT_IF FALSE diff --git a/tests/auto/cmake/mockplugins/mock5plugin/qmock5plugin.h b/tests/auto/cmake/mockplugins/mock5plugin/qmock5plugin.h index 5f2c9eeeb9..4b6c95fb23 100644 --- a/tests/auto/cmake/mockplugins/mock5plugin/qmock5plugin.h +++ b/tests/auto/cmake/mockplugins/mock5plugin/qmock5plugin.h @@ -1,5 +1,5 @@ // Copyright (C) 2018 Kitware, Inc. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef QMOCK5PLUGIN_H #define QMOCK5PLUGIN_H diff --git a/tests/auto/cmake/mockplugins/mock6plugin/CMakeLists.txt b/tests/auto/cmake/mockplugins/mock6plugin/CMakeLists.txt index 1a1272d878..5d80407d57 100644 --- a/tests/auto/cmake/mockplugins/mock6plugin/CMakeLists.txt +++ b/tests/auto/cmake/mockplugins/mock6plugin/CMakeLists.txt @@ -2,6 +2,7 @@ # SPDX-License-Identifier: BSD-3-Clause qt_internal_add_plugin(QMock6Plugin + NO_UNITY_BUILD CLASS_NAME QMock6Plugin PLUGIN_TYPE mockauxplugin SOURCES diff --git a/tests/auto/cmake/mockplugins/mock6plugin/qmock6plugin.h b/tests/auto/cmake/mockplugins/mock6plugin/qmock6plugin.h index e2a3eb10c5..5278d67960 100644 --- a/tests/auto/cmake/mockplugins/mock6plugin/qmock6plugin.h +++ b/tests/auto/cmake/mockplugins/mock6plugin/qmock6plugin.h @@ -1,5 +1,5 @@ // Copyright (C) 2018 Kitware, Inc. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef QMOCK6PLUGIN_H #define QMOCK6PLUGIN_H diff --git a/tests/auto/cmake/mockplugins/mockplugins1/CMakeLists.txt b/tests/auto/cmake/mockplugins/mockplugins1/CMakeLists.txt index 933f6dde5d..adba60e42d 100644 --- a/tests/auto/cmake/mockplugins/mockplugins1/CMakeLists.txt +++ b/tests/auto/cmake/mockplugins/mockplugins1/CMakeLists.txt @@ -2,6 +2,7 @@ # SPDX-License-Identifier: BSD-3-Clause qt_internal_add_module(MockPlugins1 + NO_UNITY_BUILD PLUGIN_TYPES mockplugin SOURCES qmockplugin.h diff --git a/tests/auto/cmake/mockplugins/mockplugins1/fake.cpp b/tests/auto/cmake/mockplugins/mockplugins1/fake.cpp index f71e2748a2..6cdf6a09ce 100644 --- a/tests/auto/cmake/mockplugins/mockplugins1/fake.cpp +++ b/tests/auto/cmake/mockplugins/mockplugins1/fake.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2019 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtCore/QtGlobal> diff --git a/tests/auto/cmake/mockplugins/mockplugins1/qmockplugin.h b/tests/auto/cmake/mockplugins/mockplugins1/qmockplugin.h index ee9db067c5..d4dcea5c20 100644 --- a/tests/auto/cmake/mockplugins/mockplugins1/qmockplugin.h +++ b/tests/auto/cmake/mockplugins/mockplugins1/qmockplugin.h @@ -1,11 +1,11 @@ // Copyright (C) 2018 Kitware, Inc. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef QMOCKPLUGIN_H #define QMOCKPLUGIN_H -#include <QString> -#include <QtPlugin> +#include <QtCore/QString> +#include <QtCore/QtPlugin> QT_BEGIN_NAMESPACE diff --git a/tests/auto/cmake/mockplugins/mockplugins2/CMakeLists.txt b/tests/auto/cmake/mockplugins/mockplugins2/CMakeLists.txt index 62fd34e90b..a797206cd6 100644 --- a/tests/auto/cmake/mockplugins/mockplugins2/CMakeLists.txt +++ b/tests/auto/cmake/mockplugins/mockplugins2/CMakeLists.txt @@ -2,6 +2,7 @@ # SPDX-License-Identifier: BSD-3-Clause qt_internal_add_module(MockPlugins2 + NO_UNITY_BUILD SOURCES fake.cpp LIBRARIES diff --git a/tests/auto/cmake/mockplugins/mockplugins2/fake.cpp b/tests/auto/cmake/mockplugins/mockplugins2/fake.cpp index 2ad5f6144a..9256ef181f 100644 --- a/tests/auto/cmake/mockplugins/mockplugins2/fake.cpp +++ b/tests/auto/cmake/mockplugins/mockplugins2/fake.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2019 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtCore/QtGlobal> diff --git a/tests/auto/cmake/mockplugins/mockplugins3/CMakeLists.txt b/tests/auto/cmake/mockplugins/mockplugins3/CMakeLists.txt index 5df9c1b685..b8e3c54535 100644 --- a/tests/auto/cmake/mockplugins/mockplugins3/CMakeLists.txt +++ b/tests/auto/cmake/mockplugins/mockplugins3/CMakeLists.txt @@ -2,6 +2,7 @@ # SPDX-License-Identifier: BSD-3-Clause qt_internal_add_module(MockPlugins3 + NO_UNITY_BUILD PLUGIN_TYPES mockauxplugin SOURCES qmockauxplugin.h diff --git a/tests/auto/cmake/mockplugins/mockplugins3/fake.cpp b/tests/auto/cmake/mockplugins/mockplugins3/fake.cpp index 5a3c187143..9ca82b9ef7 100644 --- a/tests/auto/cmake/mockplugins/mockplugins3/fake.cpp +++ b/tests/auto/cmake/mockplugins/mockplugins3/fake.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2019 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtCore/QtGlobal> diff --git a/tests/auto/cmake/mockplugins/mockplugins3/qmockauxplugin.h b/tests/auto/cmake/mockplugins/mockplugins3/qmockauxplugin.h index 80dcddf993..599c3ecbb4 100644 --- a/tests/auto/cmake/mockplugins/mockplugins3/qmockauxplugin.h +++ b/tests/auto/cmake/mockplugins/mockplugins3/qmockauxplugin.h @@ -1,11 +1,11 @@ // Copyright (C) 2018 Kitware, Inc. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef QMOCKAUXPLUGIN_H #define QMOCKAUXPLUGIN_H -#include <QString> -#include <QtPlugin> +#include <QtCore/QString> +#include <QtCore/QtPlugin> QT_BEGIN_NAMESPACE |