From d203f82916dc4e04279ab890eeeb63a991313621 Mon Sep 17 00:00:00 2001
From: Amir Masoud Abdol <amir.abdol@qt.io>
Date: Thu, 9 Mar 2023 15:21:41 +0100
Subject: 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>
---
 tests/auto/cmake/mockplugins/mockplugins1/qmockplugin.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/auto/cmake/mockplugins/mockplugins1/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
 
-- 
cgit v1.2.3