Imported Upstream version 3.16.2upstream/3.16.2

5 files changed, 37 insertions, 54 deletions

diff --git a/Tests/CMakeLib/testCTestResourceSpec.cxx b/Tests/CMakeLib/testCTestResourceSpec.cxx
index b69003d5a..99bee56c0 100644
--- a/Tests/CMakeLib/testCTestResourceSpec.cxx
+++ b/Tests/CMakeLib/testCTestResourceSpec.cxx
@@ -21,43 +21,42 @@ static const std::vector<ExpectedSpec> expectedResourceSpecs = {
     {"threads", {
     }},
   }}}},
-  {"spec2.json", true, {{{
-  }}}},
-  {"spec3.json", false, {{{}}}},
-  {"spec4.json", false, {{{}}}},
-  {"spec5.json", false, {{{}}}},
-  {"spec6.json", false, {{{}}}},
-  {"spec7.json", false, {{{}}}},
-  {"spec8.json", false, {{{}}}},
-  {"spec9.json", false, {{{}}}},
-  {"spec10.json", false, {{{}}}},
-  {"spec11.json", false, {{{}}}},
-  {"spec12.json", false, {{{}}}},
-  {"spec13.json", false, {{{}}}},
-  {"spec14.json", true, {{{}}}},
-  {"spec15.json", true, {{{}}}},
-  {"spec16.json", true, {{{}}}},
-  {"spec17.json", false, {{{}}}},
-  {"spec18.json", false, {{{}}}},
-  {"spec19.json", false, {{{}}}},
-  {"spec20.json", true, {{{}}}},
-  {"spec21.json", false, {{{}}}},
-  {"spec22.json", false, {{{}}}},
-  {"spec23.json", false, {{{}}}},
-  {"spec24.json", false, {{{}}}},
-  {"spec25.json", false, {{{}}}},
-  {"spec26.json", false, {{{}}}},
-  {"spec27.json", false, {{{}}}},
-  {"spec28.json", false, {{{}}}},
-  {"spec29.json", false, {{{}}}},
-  {"spec30.json", false, {{{}}}},
-  {"spec31.json", false, {{{}}}},
-  {"spec32.json", false, {{{}}}},
-  {"spec33.json", false, {{{}}}},
-  {"spec34.json", false, {{{}}}},
-  {"spec35.json", false, {{{}}}},
-  {"spec36.json", false, {{{}}}},
-  {"noexist.json", false, {{{}}}},
+  {"spec2.json", true, {}},
+  {"spec3.json", false, {}},
+  {"spec4.json", false, {}},
+  {"spec5.json", false, {}},
+  {"spec6.json", false, {}},
+  {"spec7.json", false, {}},
+  {"spec8.json", false, {}},
+  {"spec9.json", false, {}},
+  {"spec10.json", false, {}},
+  {"spec11.json", false, {}},
+  {"spec12.json", false, {}},
+  {"spec13.json", false, {}},
+  {"spec14.json", true, {}},
+  {"spec15.json", true, {}},
+  {"spec16.json", true, {}},
+  {"spec17.json", false, {}},
+  {"spec18.json", false, {}},
+  {"spec19.json", false, {}},
+  {"spec20.json", true, {}},
+  {"spec21.json", false, {}},
+  {"spec22.json", false, {}},
+  {"spec23.json", false, {}},
+  {"spec24.json", false, {}},
+  {"spec25.json", false, {}},
+  {"spec26.json", false, {}},
+  {"spec27.json", false, {}},
+  {"spec28.json", false, {}},
+  {"spec29.json", false, {}},
+  {"spec30.json", false, {}},
+  {"spec31.json", false, {}},
+  {"spec32.json", false, {}},
+  {"spec33.json", false, {}},
+  {"spec34.json", false, {}},
+  {"spec35.json", false, {}},
+  {"spec36.json", false, {}},
+  {"noexist.json", false, {}},
   /* clang-format on */
 };
 
diff --git a/Tests/QtAutogen/SameName/CMakeLists.txt b/Tests/QtAutogen/SameName/CMakeLists.txt
index 1919cc739..cd29a2a85 100644
--- a/Tests/QtAutogen/SameName/CMakeLists.txt
+++ b/Tests/QtAutogen/SameName/CMakeLists.txt
@@ -18,7 +18,6 @@ add_executable(sameName
   ccc/data.qrc
   item.cpp
   object.h
-  object.hh
   object.h++
   object.hpp
   object.hxx
diff --git a/Tests/QtAutogen/SameName/main.cpp b/Tests/QtAutogen/SameName/main.cpp
index 725f4cd7b..19a6f6d1b 100644
--- a/Tests/QtAutogen/SameName/main.cpp
+++ b/Tests/QtAutogen/SameName/main.cpp
@@ -6,7 +6,6 @@
 #include "item.hpp"
 #include "object.h"
 #include "object.h++"
-#include "object.hh"
 #include "object.hpp"
 #include "object.hxx"
 #include "object_upper_ext.H"
@@ -22,7 +21,6 @@ int main(int argv, char** args)
   ::ccc::Item ccc_item;
   // Object instances
   ::Object_h obj_h;
-  ::Object_hh obj_hh;
   ::Object_hplpl obj_hplpl;
   ::Object_hpp obj_hpp;
   ::Object_hxx obj_hxx;
diff --git a/Tests/QtAutogen/SameName/object.hh b/Tests/QtAutogen/SameName/object.hh
deleted file mode 100644
index 3e16f8332..000000000
--- a/Tests/QtAutogen/SameName/object.hh
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef OBJECT_HH
-#define OBJECT_HH
-
-#include <QObject>
-
-class Object_hh : public QObject
-{
-  Q_OBJECT
-  Q_SLOT
-  void go(){};
-};
-
-#endif
diff --git a/Tests/RunCMake/VS10Project/VsPrecompileHeaders-check.cmake b/Tests/RunCMake/VS10Project/VsPrecompileHeaders-check.cmake
index 27842f98e..91cea0ef8 100644
--- a/Tests/RunCMake/VS10Project/VsPrecompileHeaders-check.cmake
+++ b/Tests/RunCMake/VS10Project/VsPrecompileHeaders-check.cmake
@@ -31,7 +31,7 @@ foreach(line IN LISTS tgt_projects_strings)
     set(have_pch_header ON)
   endif()
 
-  if (line MATCHES "<ForcedIncludeFiles.*>.*${pch_header}</ForcedIncludeFiles>")
+  if (line MATCHES "<ForcedIncludeFiles.*>.*${pch_header}.*</ForcedIncludeFiles>")
     set(have_force_pch_header ON)
   endif()