tests: Add a shared project to the BigSolution

This will allow testing/studying concurrency issues that may occur in
solutions with several Qt projects, when they are built in parallel.

This patch removes the 'concurrency' project which is no longer needed.

Change-Id: I2c32be87082f07a3bd030b33683b92e1216d9fdb
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>

37 files changed, 326 insertions, 621 deletions

diff --git a/Tests/BigSolution/generator/Program.cs b/Tests/BigSolution/generator/Program.cs
index b6666ecd..ca863078 100644
--- a/Tests/BigSolution/generator/Program.cs
+++ b/Tests/BigSolution/generator/Program.cs
@@ -38,51 +38,27 @@ namespace generator
 {
     internal class Program
     {
-        static void Main(string[] args)
+        static void GenerateProject(
+            StringBuilder genSolutionProjectRef,
+            StringBuilder genSolutionProjectConfigs,
+            string pathToTemplateDir,
+            string pathToGeneratedDir,
+            int projectCount,
+            string projectGuid,
+            string projectName,
+            string projectRef,
+            IEnumerable<string> projectConfigsList)
         {
-            var projectCount = args.Length > 0 ? Convert.ToInt32(args[0]) : 400;
-            var pathToTemplateDir = Path.GetFullPath(@"..\..\..\template");
-            var pathToGeneratedDir = Path.GetFullPath(@"..\..\..\generated");
-            var templateFiles = Directory.GetFiles(
-                pathToTemplateDir, "*", SearchOption.AllDirectories);
-            var solutionFilePath = templateFiles
-                .Where(x => Path.GetExtension(x) == ".sln")
-                .First();
-            var solutionName = Path.GetFileName(solutionFilePath);
-            var solutionText = File.ReadAllText(solutionFilePath);
-            var projectFilePath = templateFiles
-                .Where(x => Path.GetExtension(x) == ".vcxproj")
-                .First();
-            var projectText = File.ReadAllText(projectFilePath);
-            var projectName = Path.GetFileNameWithoutExtension(projectFilePath);
-            var projectGuidMatch = Regex.Match(projectText, @"<ProjectGuid>({[^}]+})<");
-            var projectGuid = projectGuidMatch.Groups[1].Value;
-
-            var projectRef = Regex
-                .Match(solutionText,
-                    @"^Project.*" + projectGuid + @"""\r\nEndProject\r\n", RegexOptions.Multiline)
-                .Value;
-
-            var projectConfigsList = Regex
-                .Matches(solutionText,
-                    @"^\s+" + projectGuid + @".*\r\n", RegexOptions.Multiline)
-                .Cast<Match>()
-                .Select(x => x.Value);
-            var projectConfigs = string.Join("", projectConfigsList);
-
             var projectFiles = Directory.GetFiles(
                 Path.Combine(pathToTemplateDir, projectName),
                 "*", SearchOption.TopDirectoryOnly);
 
-            if (Directory.Exists(pathToGeneratedDir))
-                Directory.Delete(pathToGeneratedDir, true);
-
-            var genSolutionProjectRef = new StringBuilder();
-            var genSolutionProjectConfigs = new StringBuilder();
-
-            for (int i = 1; i <= projectCount; i++) {
+            bool singleProject = false;
+            for (int i = 1; !singleProject && i <= projectCount; i++) {
                 var idxStr = string.Format("{0:D3}", i);
                 var genProjectName = projectName.Replace("NNN", idxStr);
+                if (genProjectName == projectName)
+                    singleProject = true;
                 var genProjectDirPath = Path.Combine(pathToGeneratedDir, genProjectName);
                 var genProjectGuid = projectGuid.Replace("000", idxStr);
 
@@ -110,9 +86,66 @@ namespace generator
                     genSolutionProjectConfigs.Append(genProjectConfig);
                 }
             }
-            var genSolutionText = solutionText
-                .Replace(projectRef, genSolutionProjectRef.ToString())
-                .Replace(projectConfigs, genSolutionProjectConfigs.ToString());
+        }
+
+        static void Main(string[] args)
+        {
+            int projectCount;
+            if (args.Length == 0 || !int.TryParse(args[0], out projectCount)) {
+                string userProjectCount;
+                do {
+                    Console.Write("Project count: ");
+                    userProjectCount = Console.ReadLine();
+                } while (!int.TryParse(userProjectCount, out projectCount));
+            }
+            var pathToTemplateDir = Path.GetFullPath(@"..\..\..\template");
+            var pathToGeneratedDir = Path.GetFullPath(
+                $@"..\..\..\generated_{DateTime.Now.ToString("yyyyMMddhhmmssfff")}");
+            var templateFiles = Directory.GetFiles(
+                pathToTemplateDir, "*", SearchOption.AllDirectories);
+            var solutionFilePath = templateFiles
+                .Where(x => Path.GetExtension(x) == ".sln")
+                .First();
+            var solutionName = Path.GetFileName(solutionFilePath);
+            var solutionText = File.ReadAllText(solutionFilePath);
+            var projectFilePaths = templateFiles
+                .Where(x => Path.GetExtension(x) == ".vcxproj");
+            var genSolutionText = solutionText;
+            if (Directory.Exists(pathToGeneratedDir))
+                Directory.Delete(pathToGeneratedDir, true);
+            foreach (var projectFilePath in projectFilePaths) {
+                var genSolutionProjectRef = new StringBuilder();
+                var genSolutionProjectConfigs = new StringBuilder();
+                var projectText = File.ReadAllText(projectFilePath);
+                var projectName = Path.GetFileNameWithoutExtension(projectFilePath);
+                var projectGuidMatch = Regex.Match(projectText, @"<ProjectGuid>({[^}]+})<");
+                var projectGuid = projectGuidMatch.Groups[1].Value;
+                var projectRef = Regex
+                    .Match(solutionText,
+                        @"^Project.*" + projectGuid + @"""\r\nEndProject\r\n",
+                        RegexOptions.Multiline | RegexOptions.IgnoreCase)
+                    .Value;
+                var projectConfigsList = Regex
+                    .Matches(solutionText,
+                        @"^\s+" + projectGuid + @".*\r\n",
+                        RegexOptions.Multiline | RegexOptions.IgnoreCase)
+                    .Cast<Match>()
+                    .Select(x => x.Value);
+                var projectConfigs = string.Join("", projectConfigsList);
+                GenerateProject(
+                    genSolutionProjectRef,
+                    genSolutionProjectConfigs,
+                    pathToTemplateDir,
+                    pathToGeneratedDir,
+                    projectCount,
+                    projectGuid,
+                    projectName,
+                    projectRef,
+                    projectConfigsList);
+                genSolutionText = genSolutionText
+                    .Replace(projectRef, genSolutionProjectRef.ToString())
+                    .Replace(projectConfigs, genSolutionProjectConfigs.ToString());
+            }
             var genSolutionFilePath = Path.Combine(pathToGeneratedDir, solutionName);
             File.WriteAllText(genSolutionFilePath, genSolutionText);
         }
diff --git a/Tests/BigSolution/template/BigProjectNNN/BigProjectNNN.vcxproj b/Tests/BigSolution/template/BigProjectNNN/BigProjectNNN.vcxproj
index 84dc5489..52e63c7a 100644
--- a/Tests/BigSolution/template/BigProjectNNN/BigProjectNNN.vcxproj
+++ b/Tests/BigSolution/template/BigProjectNNN/BigProjectNNN.vcxproj
@@ -95,6 +95,14 @@
     <QtUic Include="BigProjectNNN.ui" />
     <QtRcc Include="BigProjectNNN.qrc" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\QtClassLibrary\QtClassLibrary.vcxproj">
+      <Project>{ce78ec51-c4a0-465b-a161-21c257bd057b}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\StaticLib\StaticLib.vcxproj">
+      <Project>{8463051a-b32c-43f0-9a77-9f223598aac9}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
     <Import Project="$(QtMsBuild)\qt.targets" />
diff --git a/Tests/BigSolution/template/BigSolution.sln b/Tests/BigSolution/template/BigSolution.sln
index 3fbfa8b7..e64bc5ac 100644
--- a/Tests/BigSolution/template/BigSolution.sln
+++ b/Tests/BigSolution/template/BigSolution.sln
@@ -3,6 +3,10 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31229.387
 MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QtClassLibrary", "QtClassLibrary\QtClassLibrary.vcxproj", "{CE78EC51-C4A0-465B-A161-21C257BD057B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StaticLib", "StaticLib\StaticLib.vcxproj", "{8463051A-B32C-43F0-9A77-9F223598AAC9}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BigProjectNNN", "BigProjectNNN\BigProjectNNN.vcxproj", "{C032BE4B-48F7-465F-BA2A-44962223E000}"
 EndProject
 Global
@@ -11,6 +15,14 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{CE78EC51-C4A0-465B-A161-21C257BD057B}.Debug|x64.ActiveCfg = Debug|x64
+		{CE78EC51-C4A0-465B-A161-21C257BD057B}.Debug|x64.Build.0 = Debug|x64
+		{CE78EC51-C4A0-465B-A161-21C257BD057B}.Release|x64.ActiveCfg = Release|x64
+		{CE78EC51-C4A0-465B-A161-21C257BD057B}.Release|x64.Build.0 = Release|x64
+		{8463051A-B32C-43F0-9A77-9F223598AAC9}.Debug|x64.ActiveCfg = Debug|x64
+		{8463051A-B32C-43F0-9A77-9F223598AAC9}.Debug|x64.Build.0 = Debug|x64
+		{8463051A-B32C-43F0-9A77-9F223598AAC9}.Release|x64.ActiveCfg = Release|x64
+		{8463051A-B32C-43F0-9A77-9F223598AAC9}.Release|x64.Build.0 = Release|x64
 		{C032BE4B-48F7-465F-BA2A-44962223E000}.Debug|x64.ActiveCfg = Debug|x64
 		{C032BE4B-48F7-465F-BA2A-44962223E000}.Debug|x64.Build.0 = Debug|x64
 		{C032BE4B-48F7-465F-BA2A-44962223E000}.Release|x64.ActiveCfg = Release|x64
diff --git a/Tests/BigSolution/template/QtClassLibrary/QtClass.cpp b/Tests/BigSolution/template/QtClassLibrary/QtClass.cpp
new file mode 100644
index 00000000..4251d2e6
--- /dev/null
+++ b/Tests/BigSolution/template/QtClassLibrary/QtClass.cpp
@@ -0,0 +1,38 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt VS Tools.
+**
+** $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$
+**
+****************************************************************************/
+
+#include "QtClass.h"
+
+QtClass::QtClass(QObject *parent)
+    : QObject(parent)
+{
+}
+
+QtClass::~QtClass()
+{
+}
diff --git a/Tests/BigSolution/template/QtClassLibrary/QtClass.h b/Tests/BigSolution/template/QtClassLibrary/QtClass.h
new file mode 100644
index 00000000..ce49282b
--- /dev/null
+++ b/Tests/BigSolution/template/QtClassLibrary/QtClass.h
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt VS Tools.
+**
+** $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$
+**
+****************************************************************************/
+
+#pragma once
+#include "qtclasslibrary_global.h"
+
+#include <QObject>
+
+class QTCLASSLIBRARY_EXPORT QtClass : public QObject
+{
+    Q_OBJECT
+
+public:
+    QtClass(QObject *parent);
+    ~QtClass();
+};
diff --git a/Tests/BigSolution/template/QtClassLibrary/QtClassLibrary.cpp b/Tests/BigSolution/template/QtClassLibrary/QtClassLibrary.cpp
new file mode 100644
index 00000000..355a7a6d
--- /dev/null
+++ b/Tests/BigSolution/template/QtClassLibrary/QtClassLibrary.cpp
@@ -0,0 +1,33 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt VS Tools.
+**
+** $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$
+**
+****************************************************************************/
+
+#include "QtClassLibrary.h"
+
+QtClassLibrary::QtClassLibrary()
+{
+}
diff --git a/Tests/BigSolution/template/QtClassLibrary/QtClassLibrary.h b/Tests/BigSolution/template/QtClassLibrary/QtClassLibrary.h
new file mode 100644
index 00000000..9f667d79
--- /dev/null
+++ b/Tests/BigSolution/template/QtClassLibrary/QtClassLibrary.h
@@ -0,0 +1,37 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt VS Tools.
+**
+** $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$
+**
+****************************************************************************/
+
+#pragma once
+
+#include "qtclasslibrary_global.h"
+
+class QTCLASSLIBRARY_EXPORT QtClassLibrary
+{
+public:
+    QtClassLibrary();
+};
diff --git a/Tests/concurrency/Solution1/QtClassLibrary1/QtClassLibrary1.vcxproj b/Tests/BigSolution/template/QtClassLibrary/QtClassLibrary.vcxproj
index 50b8f23a..f51016d7 100644
--- a/Tests/concurrency/Solution1/QtClassLibrary1/QtClassLibrary1.vcxproj
+++ b/Tests/BigSolution/template/QtClassLibrary/QtClassLibrary.vcxproj
@@ -15,9 +15,6 @@
     <Keyword>QtVS_v304</Keyword>
     <WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">10.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">10.0</WindowsTargetPlatformVersion>
-    <QtMsBuild Condition="Exists('$(MSBuildProjectDirectory)\..\..\..\..\qtmsbuild')"
-      >$([System.IO.Path]::GetFullPath(
-        $(MSBuildProjectDirectory)\..\..\..\..\qtmsbuild\QtMsBuild))</QtMsBuild>
     <QtMsBuild Condition="'$(QtMsBuild)'=='' OR !Exists('$(QtMsBuild)\qt.targets')">$(MSBuildProjectDirectory)\QtMsBuild</QtMsBuild>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -50,12 +47,10 @@
   <ImportGroup Label="Shared" />
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\MyPropertySheet.props" />
     <Import Project="$(QtMsBuild)\Qt.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\MyPropertySheet.props" />
     <Import Project="$(QtMsBuild)\Qt.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
@@ -82,7 +77,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PreprocessorDefinitions>QTCLASSLIBRARY1_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>QTCLASSLIBRARY_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -96,7 +91,7 @@
       <DebugInformationFormat>None</DebugInformationFormat>
       <Optimization>MaxSpeed</Optimization>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PreprocessorDefinitions>QTCLASSLIBRARY1_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>QTCLASSLIBRARY_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -105,10 +100,10 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <QtMoc Include="QtClass.h" />
-    <ClInclude Include="qtclasslibrary1_global.h" />
-    <ClInclude Include="QtClassLibrary1.h" />
+    <ClInclude Include="qtclasslibrary_global.h" />
+    <ClInclude Include="QtClassLibrary.h" />
     <ClCompile Include="QtClass.cpp" />
-    <ClCompile Include="QtClassLibrary1.cpp" />
+    <ClCompile Include="QtClassLibrary.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
diff --git a/Tests/concurrency/Solution1/QtClassLibrary1/QtClassLibrary1.vcxproj.filters b/Tests/BigSolution/template/QtClassLibrary/QtClassLibrary.vcxproj.filters
index 5c88d0d9..e977a922 100644
--- a/Tests/concurrency/Solution1/QtClassLibrary1/QtClassLibrary1.vcxproj.filters
+++ b/Tests/BigSolution/template/QtClassLibrary/QtClassLibrary.vcxproj.filters
@@ -19,13 +19,13 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="qtclasslibrary1_global.h">
+    <ClInclude Include="qtclasslibrary_global.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClCompile Include="QtClassLibrary1.cpp">
+    <ClCompile Include="QtClassLibrary.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClInclude Include="QtClassLibrary1.h">
+    <ClInclude Include="QtClassLibrary.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/Tests/BigSolution/template/QtClassLibrary/qtclasslibrary_global.h b/Tests/BigSolution/template/QtClassLibrary/qtclasslibrary_global.h
new file mode 100644
index 00000000..814468ca
--- /dev/null
+++ b/Tests/BigSolution/template/QtClassLibrary/qtclasslibrary_global.h
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt VS Tools.
+**
+** $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$
+**
+****************************************************************************/
+
+#pragma once
+
+#include <QtCore/qglobal.h>
+
+#ifndef BUILD_STATIC
+# if defined(QTCLASSLIBRARY_LIB)
+#  define QTCLASSLIBRARY_EXPORT Q_DECL_EXPORT
+# else
+#  define QTCLASSLIBRARY_EXPORT Q_DECL_IMPORT
+# endif
+#else
+# define QTCLASSLIBRARY_EXPORT
+#endif
diff --git a/Tests/concurrency/Solution1/StaticLib1/Header.h b/Tests/BigSolution/template/StaticLib/Header.h
index 22475e74..22475e74 100644
--- a/Tests/concurrency/Solution1/StaticLib1/Header.h
+++ b/Tests/BigSolution/template/StaticLib/Header.h
diff --git a/Tests/BigSolution/template/StaticLib/StaticLib.cpp b/Tests/BigSolution/template/StaticLib/StaticLib.cpp
new file mode 100644
index 00000000..25fb41fe
--- /dev/null
+++ b/Tests/BigSolution/template/StaticLib/StaticLib.cpp
@@ -0,0 +1,31 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt VS Tools.
+**
+** $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$
+**
+****************************************************************************/
+
+void foobar()
+{
+}
diff --git a/Tests/concurrency/Solution1/StaticLib1/StaticLib1.vcxproj b/Tests/BigSolution/template/StaticLib/StaticLib.vcxproj
index 77f3c437..3e802e84 100644
--- a/Tests/concurrency/Solution1/StaticLib1/StaticLib1.vcxproj
+++ b/Tests/BigSolution/template/StaticLib/StaticLib.vcxproj
@@ -14,7 +14,7 @@
     <VCProjectVersion>16.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{8463051a-b32c-43f0-9a77-9f223598aac9}</ProjectGuid>
-    <RootNamespace>StaticLib1</RootNamespace>
+    <RootNamespace>StaticLib</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -82,7 +82,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="StaticLib1.cpp" />
+    <ClCompile Include="StaticLib.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Header.h" />
diff --git a/Tests/concurrency/Solution1/StaticLib1/StaticLib1.vcxproj.filters b/Tests/BigSolution/template/StaticLib/StaticLib.vcxproj.filters
index ce5268c9..729b1cc9 100644
--- a/Tests/concurrency/Solution1/StaticLib1/StaticLib1.vcxproj.filters
+++ b/Tests/BigSolution/template/StaticLib/StaticLib.vcxproj.filters
@@ -15,7 +15,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="StaticLib1.cpp">
+    <ClCompile Include="StaticLib.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/Tests/concurrency/loop_msbuild.bat b/Tests/BigSolution/template/loop_msbuild.bat
index 4c98cba4..4c98cba4 100644
--- a/Tests/concurrency/loop_msbuild.bat
+++ b/Tests/BigSolution/template/loop_msbuild.bat
diff --git a/Tests/concurrency/Solution1/MyPropertySheet.props b/Tests/concurrency/Solution1/MyPropertySheet.props
deleted file mode 100644
index af2b343c..00000000
--- a/Tests/concurrency/Solution1/MyPropertySheet.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros">
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemDefinitionGroup />
-  <ItemGroup>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Tests/concurrency/Solution1/QtClassLibrary1/QtClass.cpp b/Tests/concurrency/Solution1/QtClassLibrary1/QtClass.cpp
deleted file mode 100644
index c5a77aac..00000000
--- a/Tests/concurrency/Solution1/QtClassLibrary1/QtClass.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "QtClass.h"
-
-QtClass::QtClass(QObject *parent)
-    : QObject(parent)
-{
-}
-
-QtClass::~QtClass()
-{
-}
diff --git a/Tests/concurrency/Solution1/QtClassLibrary1/QtClass.h b/Tests/concurrency/Solution1/QtClassLibrary1/QtClass.h
deleted file mode 100644
index 7e9b180d..00000000
--- a/Tests/concurrency/Solution1/QtClassLibrary1/QtClass.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-#include "qtclasslibrary1_global.h"
-
-#include <QObject>
-
-class QTCLASSLIBRARY1_EXPORT QtClass : public QObject
-{
-    Q_OBJECT
-
-public:
-    QtClass(QObject *parent);
-    ~QtClass();
-};
diff --git a/Tests/concurrency/Solution1/QtClassLibrary1/QtClassLibrary1.cpp b/Tests/concurrency/Solution1/QtClassLibrary1/QtClassLibrary1.cpp
deleted file mode 100644
index 10792c43..00000000
--- a/Tests/concurrency/Solution1/QtClassLibrary1/QtClassLibrary1.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "QtClassLibrary1.h"
-
-QtClassLibrary1::QtClassLibrary1()
-{
-}
diff --git a/Tests/concurrency/Solution1/QtClassLibrary1/QtClassLibrary1.h b/Tests/concurrency/Solution1/QtClassLibrary1/QtClassLibrary1.h
deleted file mode 100644
index 68e88384..00000000
--- a/Tests/concurrency/Solution1/QtClassLibrary1/QtClassLibrary1.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include "qtclasslibrary1_global.h"
-
-class QTCLASSLIBRARY1_EXPORT QtClassLibrary1
-{
-public:
-    QtClassLibrary1();
-};
diff --git a/Tests/concurrency/Solution1/QtClassLibrary1/qtclasslibrary1_global.h b/Tests/concurrency/Solution1/QtClassLibrary1/qtclasslibrary1_global.h
deleted file mode 100644
index 565e06ba..00000000
--- a/Tests/concurrency/Solution1/QtClassLibrary1/qtclasslibrary1_global.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include <QtCore/qglobal.h>
-
-#ifndef BUILD_STATIC
-# if defined(QTCLASSLIBRARY1_LIB)
-#  define QTCLASSLIBRARY1_EXPORT Q_DECL_EXPORT
-# else
-#  define QTCLASSLIBRARY1_EXPORT Q_DECL_IMPORT
-# endif
-#else
-# define QTCLASSLIBRARY1_EXPORT
-#endif
diff --git a/Tests/concurrency/Solution1/QtWidgetsApplication1/QtWidgetsApplication1.cpp b/Tests/concurrency/Solution1/QtWidgetsApplication1/QtWidgetsApplication1.cpp
deleted file mode 100644
index 3ae59435..00000000
--- a/Tests/concurrency/Solution1/QtWidgetsApplication1/QtWidgetsApplication1.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "QtWidgetsApplication1.h"
-#include "QtClass.h"
-#include "Header.h"
-
-QtWidgetsApplication1::QtWidgetsApplication1(QWidget *parent)
-    : QMainWindow(parent)
-{
-    ui.setupUi(this);
-    qtObject = new QtClass(this);
-    foobar();
-}
diff --git a/Tests/concurrency/Solution1/QtWidgetsApplication1/QtWidgetsApplication1.h b/Tests/concurrency/Solution1/QtWidgetsApplication1/QtWidgetsApplication1.h
deleted file mode 100644
index 5ff3b0cf..00000000
--- a/Tests/concurrency/Solution1/QtWidgetsApplication1/QtWidgetsApplication1.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include <QtWidgets/QMainWindow>
-#include "ui_QtWidgetsApplication1.h"
-
-class QtClass;
-
-class QtWidgetsApplication1 : public QMainWindow
-{
-    Q_OBJECT
-
-public:
-    QtWidgetsApplication1(QWidget *parent = nullptr);
-
-private:
-    Ui::QtWidgetsApplication1Class ui;
-    QtClass *qtObject;
-};
diff --git a/Tests/concurrency/Solution1/QtWidgetsApplication1/QtWidgetsApplication1.qrc b/Tests/concurrency/Solution1/QtWidgetsApplication1/QtWidgetsApplication1.qrc
deleted file mode 100644
index d56c1ee5..00000000
--- a/Tests/concurrency/Solution1/QtWidgetsApplication1/QtWidgetsApplication1.qrc
+++ /dev/null
@@ -1,4 +0,0 @@
-<RCC>
-    <qresource prefix="QtWidgetsApplication1">
-    </qresource>
-</RCC>
diff --git a/Tests/concurrency/Solution1/QtWidgetsApplication1/QtWidgetsApplication1.ui b/Tests/concurrency/Solution1/QtWidgetsApplication1/QtWidgetsApplication1.ui
deleted file mode 100644
index 4d40f03c..00000000
--- a/Tests/concurrency/Solution1/QtWidgetsApplication1/QtWidgetsApplication1.ui
+++ /dev/null
@@ -1,28 +0,0 @@
-<UI version="4.0" >
- <class>QtWidgetsApplication1Class</class>
- <widget class="QMainWindow" name="QtWidgetsApplication1Class" >
-  <property name="objectName" >
-   <string notr="true">QtWidgetsApplication1Class</string>
-  </property>
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>600</width>
-    <height>400</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>QtWidgetsApplication1</string>
-  </property>  <widget class="QMenuBar" name="menuBar" />
-  <widget class="QToolBar" name="mainToolBar" />
-  <widget class="QWidget" name="centralWidget" />
-  <widget class="QStatusBar" name="statusBar" />
- </widget>
- <layoutDefault spacing="6" margin="11" />
- <pixmapfunction></pixmapfunction>
- <resources>
-   <include location="QtWidgetsApplication1.qrc"/>
- </resources>
- <connections/>
-</UI>
diff --git a/Tests/concurrency/Solution1/QtWidgetsApplication1/QtWidgetsApplication1.vcxproj b/Tests/concurrency/Solution1/QtWidgetsApplication1/QtWidgetsApplication1.vcxproj
deleted file mode 100644
index 605c857a..00000000
--- a/Tests/concurrency/Solution1/QtWidgetsApplication1/QtWidgetsApplication1.vcxproj
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="$(VisualStudioVersion)" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{806AF248-25F9-4300-9FB3-100E5F79C026}</ProjectGuid>
-    <Keyword>QtVS_v304</Keyword>
-    <WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">10.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">10.0</WindowsTargetPlatformVersion>
-    <QtMsBuild Condition="Exists('$(MSBuildProjectDirectory)\..\..\..\..\qtmsbuild')"
-      >$([System.IO.Path]::GetFullPath(
-        $(MSBuildProjectDirectory)\..\..\..\..\qtmsbuild\QtMsBuild))</QtMsBuild>
-    <QtMsBuild Condition="'$(QtMsBuild)'=='' OR !Exists('$(QtMsBuild)\qt.targets')">$(MSBuildProjectDirectory)\QtMsBuild</QtMsBuild>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')">
-    <Import Project="$(QtMsBuild)\qt_defaults.props" />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="QtSettings">
-    <QtInstall>$(DefaultQtVersion)</QtInstall>
-    <QtModules>core;gui;widgets</QtModules>
-    <QtBuildConfig>debug</QtBuildConfig>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" Label="QtSettings">
-    <QtInstall>$(DefaultQtVersion)</QtInstall>
-    <QtModules>core;gui;widgets</QtModules>
-    <QtBuildConfig>release</QtBuildConfig>
-  </PropertyGroup>
-  <Target Name="QtMsBuildNotFound" BeforeTargets="CustomBuild;ClCompile" Condition="!Exists('$(QtMsBuild)\qt.targets') or !Exists('$(QtMsBuild)\qt.props')">
-    <Message Importance="High" Text="QtMsBuild: could not locate qt.targets, qt.props; project may not build correctly." />
-  </Target>
-  <ImportGroup Label="ExtensionSettings" />
-  <ImportGroup Label="Shared" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\MyPropertySheet.props" />
-    <Import Project="$(QtMsBuild)\Qt.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\MyPropertySheet.props" />
-    <Import Project="$(QtMsBuild)\Qt.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <CopyLocalProjectReference>true</CopyLocalProjectReference>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <CopyLocalProjectReference>true</CopyLocalProjectReference>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="Configuration">
-    <ClCompile>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" Label="Configuration">
-    <ClCompile>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <QtRcc Include="QtWidgetsApplication1.qrc" />
-    <QtUic Include="QtWidgetsApplication1.ui" />
-    <QtMoc Include="QtWidgetsApplication1.h" />
-    <ClCompile Include="QtWidgetsApplication1.cpp" />
-    <ClCompile Include="main.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\QtClassLibrary1\QtClassLibrary1.vcxproj">
-      <Project>{ce78ec51-c4a0-465b-a161-21c257bd057b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\StaticLib1\StaticLib1.vcxproj">
-      <Project>{8463051a-b32c-43f0-9a77-9f223598aac9}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
-    <Import Project="$(QtMsBuild)\qt.targets" />
-  </ImportGroup>
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Tests/concurrency/Solution1/QtWidgetsApplication1/QtWidgetsApplication1.vcxproj.filters b/Tests/concurrency/Solution1/QtWidgetsApplication1/QtWidgetsApplication1.vcxproj.filters
deleted file mode 100644
index 4cb63b79..00000000
--- a/Tests/concurrency/Solution1/QtWidgetsApplication1/QtWidgetsApplication1.vcxproj.filters
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>qrc;rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Form Files">
-      <UniqueIdentifier>{99349809-55BA-4b9d-BF79-8FDBB0286EB3}</UniqueIdentifier>
-      <Extensions>ui</Extensions>
-    </Filter>
-    <Filter Include="Translation Files">
-      <UniqueIdentifier>{639EADAA-A684-42e4-A9AD-28FC9BCB8F7C}</UniqueIdentifier>
-      <Extensions>ts</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <QtRcc Include="QtWidgetsApplication1.qrc">
-      <Filter>Resource Files</Filter>
-    </QtRcc>
-    <QtUic Include="QtWidgetsApplication1.ui">
-      <Filter>Form Files</Filter>
-    </QtUic>
-    <QtMoc Include="QtWidgetsApplication1.h">
-      <Filter>Header Files</Filter>
-    </QtMoc>
-    <ClCompile Include="QtWidgetsApplication1.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Tests/concurrency/Solution1/QtWidgetsApplication1/main.cpp b/Tests/concurrency/Solution1/QtWidgetsApplication1/main.cpp
deleted file mode 100644
index 8237fdac..00000000
--- a/Tests/concurrency/Solution1/QtWidgetsApplication1/main.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "QtWidgetsApplication1.h"
-#include <QtWidgets/QApplication>
-
-int main(int argc, char *argv[])
-{
-    QApplication a(argc, argv);
-    QtWidgetsApplication1 w;
-    w.show();
-    return a.exec();
-}
diff --git a/Tests/concurrency/Solution1/QtWidgetsApplication2/QtWidgetsApplication2.cpp b/Tests/concurrency/Solution1/QtWidgetsApplication2/QtWidgetsApplication2.cpp
deleted file mode 100644
index d448405a..00000000
--- a/Tests/concurrency/Solution1/QtWidgetsApplication2/QtWidgetsApplication2.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "QtWidgetsApplication2.h"
-#include "QtClass.h"
-
-QtWidgetsApplication2::QtWidgetsApplication2(QWidget *parent)
-    : QMainWindow(parent)
-{
-    ui.setupUi(this);
-    qtObject = new QtClass(this);
-}
diff --git a/Tests/concurrency/Solution1/QtWidgetsApplication2/QtWidgetsApplication2.h b/Tests/concurrency/Solution1/QtWidgetsApplication2/QtWidgetsApplication2.h
deleted file mode 100644
index 0596f967..00000000
--- a/Tests/concurrency/Solution1/QtWidgetsApplication2/QtWidgetsApplication2.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include <QtWidgets/QMainWindow>
-#include "ui_QtWidgetsApplication2.h"
-
-class QtClass;
-
-class QtWidgetsApplication2 : public QMainWindow
-{
-    Q_OBJECT
-
-public:
-    QtWidgetsApplication2(QWidget *parent = nullptr);
-
-private:
-    Ui::QtWidgetsApplication2Class ui;
-    QtClass* qtObject;
-};
diff --git a/Tests/concurrency/Solution1/QtWidgetsApplication2/QtWidgetsApplication2.qrc b/Tests/concurrency/Solution1/QtWidgetsApplication2/QtWidgetsApplication2.qrc
deleted file mode 100644
index 2018e6d2..00000000
--- a/Tests/concurrency/Solution1/QtWidgetsApplication2/QtWidgetsApplication2.qrc
+++ /dev/null
@@ -1,4 +0,0 @@
-<RCC>
-    <qresource prefix="QtWidgetsApplication2">
-    </qresource>
-</RCC>
diff --git a/Tests/concurrency/Solution1/QtWidgetsApplication2/QtWidgetsApplication2.ui b/Tests/concurrency/Solution1/QtWidgetsApplication2/QtWidgetsApplication2.ui
deleted file mode 100644
index f9a85f5b..00000000
--- a/Tests/concurrency/Solution1/QtWidgetsApplication2/QtWidgetsApplication2.ui
+++ /dev/null
@@ -1,28 +0,0 @@
-<UI version="4.0" >
- <class>QtWidgetsApplication2Class</class>
- <widget class="QMainWindow" name="QtWidgetsApplication2Class" >
-  <property name="objectName" >
-   <string notr="true">QtWidgetsApplication2Class</string>
-  </property>
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>600</width>
-    <height>400</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>QtWidgetsApplication2</string>
-  </property>  <widget class="QMenuBar" name="menuBar" />
-  <widget class="QToolBar" name="mainToolBar" />
-  <widget class="QWidget" name="centralWidget" />
-  <widget class="QStatusBar" name="statusBar" />
- </widget>
- <layoutDefault spacing="6" margin="11" />
- <pixmapfunction></pixmapfunction>
- <resources>
-   <include location="QtWidgetsApplication2.qrc"/>
- </resources>
- <connections/>
-</UI>
diff --git a/Tests/concurrency/Solution1/QtWidgetsApplication2/QtWidgetsApplication2.vcxproj b/Tests/concurrency/Solution1/QtWidgetsApplication2/QtWidgetsApplication2.vcxproj
deleted file mode 100644
index ac1ee383..00000000
--- a/Tests/concurrency/Solution1/QtWidgetsApplication2/QtWidgetsApplication2.vcxproj
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="$(VisualStudioVersion)" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B74596C2-46DC-4615-A6EF-0CB66643BB2B}</ProjectGuid>
-    <Keyword>QtVS_v304</Keyword>
-    <WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">10.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">10.0</WindowsTargetPlatformVersion>
-    <QtMsBuild Condition="Exists('$(MSBuildProjectDirectory)\..\..\..\..\qtmsbuild')"
-      >$([System.IO.Path]::GetFullPath(
-        $(MSBuildProjectDirectory)\..\..\..\..\qtmsbuild\QtMsBuild))</QtMsBuild>
-    <QtMsBuild Condition="'$(QtMsBuild)'=='' OR !Exists('$(QtMsBuild)\qt.targets')">$(MSBuildProjectDirectory)\QtMsBuild</QtMsBuild>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')">
-    <Import Project="$(QtMsBuild)\qt_defaults.props" />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="QtSettings">
-    <QtInstall>$(DefaultQtVersion)</QtInstall>
-    <QtModules>core;gui;widgets</QtModules>
-    <QtBuildConfig>debug</QtBuildConfig>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" Label="QtSettings">
-    <QtInstall>$(DefaultQtVersion)</QtInstall>
-    <QtModules>core;gui;widgets</QtModules>
-    <QtBuildConfig>release</QtBuildConfig>
-  </PropertyGroup>
-  <Target Name="QtMsBuildNotFound" BeforeTargets="CustomBuild;ClCompile" Condition="!Exists('$(QtMsBuild)\qt.targets') or !Exists('$(QtMsBuild)\qt.props')">
-    <Message Importance="High" Text="QtMsBuild: could not locate qt.targets, qt.props; project may not build correctly." />
-  </Target>
-  <ImportGroup Label="ExtensionSettings" />
-  <ImportGroup Label="Shared" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\MyPropertySheet.props" />
-    <Import Project="$(QtMsBuild)\Qt.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\MyPropertySheet.props" />
-    <Import Project="$(QtMsBuild)\Qt.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <CopyLocalProjectReference>true</CopyLocalProjectReference>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <CopyLocalProjectReference>true</CopyLocalProjectReference>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="Configuration">
-    <ClCompile>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" Label="Configuration">
-    <ClCompile>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <QtRcc Include="QtWidgetsApplication2.qrc" />
-    <QtUic Include="QtWidgetsApplication2.ui" />
-    <QtMoc Include="QtWidgetsApplication2.h" />
-    <ClCompile Include="QtWidgetsApplication2.cpp" />
-    <ClCompile Include="main.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\QtClassLibrary1\QtClassLibrary1.vcxproj">
-      <Project>{ce78ec51-c4a0-465b-a161-21c257bd057b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\StaticLib1\StaticLib1.vcxproj">
-      <Project>{8463051a-b32c-43f0-9a77-9f223598aac9}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
-    <Import Project="$(QtMsBuild)\qt.targets" />
-  </ImportGroup>
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Tests/concurrency/Solution1/QtWidgetsApplication2/QtWidgetsApplication2.vcxproj.filters b/Tests/concurrency/Solution1/QtWidgetsApplication2/QtWidgetsApplication2.vcxproj.filters
deleted file mode 100644
index f8580ae6..00000000
--- a/Tests/concurrency/Solution1/QtWidgetsApplication2/QtWidgetsApplication2.vcxproj.filters
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>qrc;rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Form Files">
-      <UniqueIdentifier>{99349809-55BA-4b9d-BF79-8FDBB0286EB3}</UniqueIdentifier>
-      <Extensions>ui</Extensions>
-    </Filter>
-    <Filter Include="Translation Files">
-      <UniqueIdentifier>{639EADAA-A684-42e4-A9AD-28FC9BCB8F7C}</UniqueIdentifier>
-      <Extensions>ts</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <QtRcc Include="QtWidgetsApplication2.qrc">
-      <Filter>Resource Files</Filter>
-    </QtRcc>
-    <QtUic Include="QtWidgetsApplication2.ui">
-      <Filter>Form Files</Filter>
-    </QtUic>
-    <QtMoc Include="QtWidgetsApplication2.h">
-      <Filter>Header Files</Filter>
-    </QtMoc>
-    <ClCompile Include="QtWidgetsApplication2.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Tests/concurrency/Solution1/QtWidgetsApplication2/main.cpp b/Tests/concurrency/Solution1/QtWidgetsApplication2/main.cpp
deleted file mode 100644
index 8f58a279..00000000
--- a/Tests/concurrency/Solution1/QtWidgetsApplication2/main.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "QtWidgetsApplication2.h"
-#include <QtWidgets/QApplication>
-
-int main(int argc, char *argv[])
-{
-    QApplication a(argc, argv);
-    QtWidgetsApplication2 w;
-    w.show();
-    return a.exec();
-}
diff --git a/Tests/concurrency/Solution1/Solution1.sln b/Tests/concurrency/Solution1/Solution1.sln
deleted file mode 100644
index 4069cb33..00000000
--- a/Tests/concurrency/Solution1/Solution1.sln
+++ /dev/null
@@ -1,43 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30804.86
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QtClassLibrary1", "QtClassLibrary1\QtClassLibrary1.vcxproj", "{CE78EC51-C4A0-465B-A161-21C257BD057B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QtWidgetsApplication1", "QtWidgetsApplication1\QtWidgetsApplication1.vcxproj", "{806AF248-25F9-4300-9FB3-100E5F79C026}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QtWidgetsApplication2", "QtWidgetsApplication2\QtWidgetsApplication2.vcxproj", "{B74596C2-46DC-4615-A6EF-0CB66643BB2B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StaticLib1", "StaticLib1\StaticLib1.vcxproj", "{8463051A-B32C-43F0-9A77-9F223598AAC9}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CE78EC51-C4A0-465B-A161-21C257BD057B}.Debug|x64.ActiveCfg = Debug|x64
-		{CE78EC51-C4A0-465B-A161-21C257BD057B}.Debug|x64.Build.0 = Debug|x64
-		{CE78EC51-C4A0-465B-A161-21C257BD057B}.Release|x64.ActiveCfg = Release|x64
-		{CE78EC51-C4A0-465B-A161-21C257BD057B}.Release|x64.Build.0 = Release|x64
-		{806AF248-25F9-4300-9FB3-100E5F79C026}.Debug|x64.ActiveCfg = Debug|x64
-		{806AF248-25F9-4300-9FB3-100E5F79C026}.Debug|x64.Build.0 = Debug|x64
-		{806AF248-25F9-4300-9FB3-100E5F79C026}.Release|x64.ActiveCfg = Release|x64
-		{806AF248-25F9-4300-9FB3-100E5F79C026}.Release|x64.Build.0 = Release|x64
-		{B74596C2-46DC-4615-A6EF-0CB66643BB2B}.Debug|x64.ActiveCfg = Debug|x64
-		{B74596C2-46DC-4615-A6EF-0CB66643BB2B}.Debug|x64.Build.0 = Debug|x64
-		{B74596C2-46DC-4615-A6EF-0CB66643BB2B}.Release|x64.ActiveCfg = Release|x64
-		{B74596C2-46DC-4615-A6EF-0CB66643BB2B}.Release|x64.Build.0 = Release|x64
-		{8463051A-B32C-43F0-9A77-9F223598AAC9}.Debug|x64.ActiveCfg = Debug|x64
-		{8463051A-B32C-43F0-9A77-9F223598AAC9}.Debug|x64.Build.0 = Debug|x64
-		{8463051A-B32C-43F0-9A77-9F223598AAC9}.Release|x64.ActiveCfg = Release|x64
-		{8463051A-B32C-43F0-9A77-9F223598AAC9}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {76259E50-26CE-4EC6-99CE-B1245F270DD3}
-	EndGlobalSection
-EndGlobal
diff --git a/Tests/concurrency/Solution1/StaticLib1/StaticLib1.cpp b/Tests/concurrency/Solution1/StaticLib1/StaticLib1.cpp
deleted file mode 100644
index 6b623059..00000000
--- a/Tests/concurrency/Solution1/StaticLib1/StaticLib1.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-void foobar()
-{
-}