diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-03-09 15:21:41 +0100 |
|---|---|---|
| committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-03-14 17:28:43 +0100 |
| commit | d203f82916dc4e04279ab890eeeb63a991313621 (patch) | |
| tree | 83c27f799ac829a909d24aa35c118b713a23ebfd /tests/auto/cmake/mockplugins/mockplugins1 | |
| parent | 608c2501e559b4f8cd6fc80a04deeb771b6449ac (diff) | |
Fix for CMake tests when build with unity
Some of the mockplugin tests needed to be excluded from the unity build
manually. In addition, MSVC's complain about include <QtCore/QString>
instead of <QString> was addressed here since it was breaking the unity
build as well.
Some other independent executable and libraries have to be excluded
manually as well.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: I1f21f8484b4d3b1c399e2118ab3a71e682a3006a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/cmake/mockplugins/mockplugins1')
| -rw-r--r-- | tests/auto/cmake/mockplugins/mockplugins1/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/auto/cmake/mockplugins/mockplugins1/qmockplugin.h | 4 |
2 files changed, 3 insertions, 2 deletions
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/qmockplugin.h b/tests/auto/cmake/mockplugins/mockplugins1/qmockplugin.h index ee9db067c5..9caf6b973a 100644 --- a/tests/auto/cmake/mockplugins/mockplugins1/qmockplugin.h +++ b/tests/auto/cmake/mockplugins/mockplugins1/qmockplugin.h @@ -4,8 +4,8 @@ #ifndef QMOCKPLUGIN_H #define QMOCKPLUGIN_H -#include <QString> -#include <QtPlugin> +#include <QtCore/QString> +#include <QtCore/QtPlugin> QT_BEGIN_NAMESPACE |