소스 검색

Tests: Restore Autogen/SameName .hh header test

In commit 7fa7f55230fda5ac0135b1f4a220c15ad5983857, the Autogen/SameName test
was changed to not test .hh header file processing in AUTOGEN anymore,
because we had to revert that feature.  Since we now support .hh header file
processing in AUTOMOC again, we can restore the Autogen/SameName test for
that.
Sebastian Holtermann 5 년 전
부모
커밋
8c2be3ae94
3개의 변경된 파일20개의 추가작업 그리고 1개의 파일을 삭제
  1. 5 1
      Tests/QtAutogen/SameName/CMakeLists.txt
  2. 2 0
      Tests/QtAutogen/SameName/main.cpp
  3. 13 0
      Tests/QtAutogen/SameName/object.hh

+ 5 - 1
Tests/QtAutogen/SameName/CMakeLists.txt

@@ -1,7 +1,10 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.16.0)
 project(SameName)
 include("../AutogenGuiTest.cmake")
 
+# Process .hh headers in AUTOMOC
+cmake_policy(SET CMP0100 NEW)
+
 # Test AUTOMOC and AUTORCC on source files with the same name
 # but in different subdirectories
 
@@ -18,6 +21,7 @@ add_executable(sameName
   ccc/data.qrc
   item.cpp
   object.h
+  object.hh
   object.h++
   object.hpp
   object.hxx

+ 2 - 0
Tests/QtAutogen/SameName/main.cpp

@@ -6,6 +6,7 @@
 #include "item.hpp"
 #include "object.h"
 #include "object.h++"
+#include "object.hh"
 #include "object.hpp"
 #include "object.hxx"
 #include "object_upper_ext.H"
@@ -21,6 +22,7 @@ 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;

+ 13 - 0
Tests/QtAutogen/SameName/object.hh

@@ -0,0 +1,13 @@
+#ifndef OBJECT_HH
+#define OBJECT_HH
+
+#include <QObject>
+
+class Object_hh : public QObject
+{
+  Q_OBJECT
+  Q_SLOT
+  void go(){};
+};
+
+#endif