浏览代码

Autogen: Tests: Separate SameName test

Sebastian Holtermann 8 年之前
父节点
当前提交
45b6776ab3

+ 0 - 4
Tests/QtAutogen/CMakeLists.txt

@@ -59,10 +59,6 @@ if(NON_ASCII_BDIR AND WIN32)
   set(ALLOW_WRAP_CPP FALSE)
 endif()
 
-# -- Test
-# Source files with the same basename in different subdirectories
-add_subdirectory(sameName)
-
 # -- Test
 # Tests static library cycles
 add_subdirectory(staticLibraryCycle)

+ 1 - 0
Tests/QtAutogen/CommonTests.cmake

@@ -28,3 +28,4 @@ ADD_AUTOGEN_TEST(ObjectLibrary someProgram)
 if(APPLE AND (NOT QT_TEST_VERSION STREQUAL 4))
   ADD_AUTOGEN_TEST(MacOsFW)
 endif()
+ADD_AUTOGEN_TEST(SameName sameName)

+ 6 - 1
Tests/QtAutogen/sameName/CMakeLists.txt → Tests/QtAutogen/SameName/CMakeLists.txt

@@ -1,3 +1,7 @@
+cmake_minimum_required(VERSION 3.10)
+project(SameName)
+include("../AutogenTest.cmake")
+
 # Test AUTOMOC and AUTORCC on source files with the same name
 # but in different subdirectories
 
@@ -20,7 +24,8 @@ target_link_libraries(sameName ${QT_LIBRARIES})
 set_target_properties(sameName PROPERTIES
   AUTOMOC TRUE
   AUTOUIC TRUE
-  AUTORCC TRUE)
+  AUTORCC TRUE
+)
 
 # Set different compression levels
 if (QT_TEST_VERSION STREQUAL 4)

+ 0 - 0
Tests/QtAutogen/sameName/aaa/bbb/data.qrc → Tests/QtAutogen/SameName/aaa/bbb/data.qrc


+ 0 - 0
Tests/QtAutogen/sameName/aaa/bbb/item.cpp → Tests/QtAutogen/SameName/aaa/bbb/item.cpp


+ 0 - 0
Tests/QtAutogen/sameName/aaa/bbb/item.hpp → Tests/QtAutogen/SameName/aaa/bbb/item.hpp


+ 0 - 0
Tests/QtAutogen/sameName/aaa/data.qrc → Tests/QtAutogen/SameName/aaa/data.qrc


+ 0 - 0
Tests/QtAutogen/sameName/aaa/item.cpp → Tests/QtAutogen/SameName/aaa/item.cpp


+ 0 - 0
Tests/QtAutogen/sameName/aaa/item.hpp → Tests/QtAutogen/SameName/aaa/item.hpp


+ 0 - 0
Tests/QtAutogen/sameName/aaa/view.ui → Tests/QtAutogen/SameName/aaa/view.ui


+ 0 - 0
Tests/QtAutogen/sameName/bbb/aaa/data.qrc → Tests/QtAutogen/SameName/bbb/aaa/data.qrc


+ 0 - 0
Tests/QtAutogen/sameName/bbb/aaa/item.cpp → Tests/QtAutogen/SameName/bbb/aaa/item.cpp


+ 0 - 0
Tests/QtAutogen/sameName/bbb/aaa/item.hpp → Tests/QtAutogen/SameName/bbb/aaa/item.hpp


+ 0 - 0
Tests/QtAutogen/sameName/bbb/data.qrc → Tests/QtAutogen/SameName/bbb/data.qrc


+ 0 - 0
Tests/QtAutogen/sameName/bbb/item.cpp → Tests/QtAutogen/SameName/bbb/item.cpp


+ 0 - 0
Tests/QtAutogen/sameName/bbb/item.hpp → Tests/QtAutogen/SameName/bbb/item.hpp


+ 0 - 0
Tests/QtAutogen/sameName/bbb/view.ui → Tests/QtAutogen/SameName/bbb/view.ui


+ 0 - 0
Tests/QtAutogen/sameName/ccc/data.qrc → Tests/QtAutogen/SameName/ccc/data.qrc


+ 0 - 0
Tests/QtAutogen/sameName/ccc/item.cpp → Tests/QtAutogen/SameName/ccc/item.cpp


+ 0 - 0
Tests/QtAutogen/sameName/ccc/item.hpp → Tests/QtAutogen/SameName/ccc/item.hpp


+ 0 - 0
Tests/QtAutogen/sameName/ccc/view.ui → Tests/QtAutogen/SameName/ccc/view.ui


+ 0 - 0
Tests/QtAutogen/sameName/data.qrc → Tests/QtAutogen/SameName/data.qrc


+ 0 - 0
Tests/QtAutogen/sameName/item.cpp → Tests/QtAutogen/SameName/item.cpp


+ 0 - 0
Tests/QtAutogen/sameName/item.hpp → Tests/QtAutogen/SameName/item.hpp


+ 0 - 0
Tests/QtAutogen/sameName/main.cpp → Tests/QtAutogen/SameName/main.cpp


+ 0 - 0
Tests/QtAutogen/sameName/view.ui → Tests/QtAutogen/SameName/view.ui