diff options
-rw-r--r-- | Tests/CMakeLists.txt | 34 | ||||
-rw-r--r-- | Tests/QtAutogen/CMakeLists.txt | 64 | ||||
-rw-r--r-- | Tests/QtAutogen/CommonTests.cmake | 1 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/Adir/CMakeLists.txt (renamed from Tests/QtAutogen/complex/Adir/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/Adir/libA.cpp (renamed from Tests/QtAutogen/complex/Adir/libA.cpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/Adir/libA.h (renamed from Tests/QtAutogen/complex/Adir/libA.h) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/Bdir/CMakeLists.txt (renamed from Tests/QtAutogen/complex/Bdir/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/Bdir/libB.cpp (renamed from Tests/QtAutogen/complex/Bdir/libB.cpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/Bdir/libB.h (renamed from Tests/QtAutogen/complex/Bdir/libB.h) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/CMakeLists.txt (renamed from Tests/QtAutogen/complex/CMakeLists.txt) | 6 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/abc.cpp (renamed from Tests/QtAutogen/complex/abc.cpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/abc.h (renamed from Tests/QtAutogen/complex/abc.h) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/abc_p.h (renamed from Tests/QtAutogen/complex/abc_p.h) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/bar.cpp (renamed from Tests/QtAutogen/complex/bar.cpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/blub.cpp (renamed from Tests/QtAutogen/complex/blub.cpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/blub.h (renamed from Tests/QtAutogen/complex/blub.h) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/calwidget.cpp (renamed from Tests/QtAutogen/complex/calwidget.cpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/calwidget.h (renamed from Tests/QtAutogen/complex/calwidget.h) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/calwidget.ui (renamed from Tests/QtAutogen/complex/calwidget.ui) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/codeeditor.cpp (renamed from Tests/QtAutogen/complex/codeeditor.cpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/codeeditor.h (renamed from Tests/QtAutogen/complex/codeeditor.h) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/debug_class.cpp (renamed from Tests/QtAutogen/complex/debug_class.cpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/debug_class.h (renamed from Tests/QtAutogen/complex/debug_class.h) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/debug_class.ui (renamed from Tests/QtAutogen/complex/debug_class.ui) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/debug_resource.qrc (renamed from Tests/QtAutogen/complex/debug_resource.qrc) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/foo.cpp (renamed from Tests/QtAutogen/complex/foo.cpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/foo.h (renamed from Tests/QtAutogen/complex/foo.h) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/gadget.cpp (renamed from Tests/QtAutogen/complex/gadget.cpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/gadget.h (renamed from Tests/QtAutogen/complex/gadget.h) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/generated.cpp (renamed from Tests/QtAutogen/complex/generated.cpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/generated.h (renamed from Tests/QtAutogen/complex/generated.h) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/generated.txt.in (renamed from Tests/QtAutogen/complex/generated.txt.in) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/generated_resource.qrc.in (renamed from Tests/QtAutogen/complex/generated_resource.qrc.in) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/libC.cpp (renamed from Tests/QtAutogen/complex/libC.cpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/libC.h (renamed from Tests/QtAutogen/complex/libC.h) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/main.cpp (renamed from Tests/QtAutogen/complex/main.cpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/multiplewidgets.cpp (renamed from Tests/QtAutogen/complex/multiplewidgets.cpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/multiplewidgets.h (renamed from Tests/QtAutogen/complex/multiplewidgets.h) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/myinterface.h.in (renamed from Tests/QtAutogen/complex/myinterface.h.in) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/myotherinterface.h.in (renamed from Tests/QtAutogen/complex/myotherinterface.h.in) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/private_slot.cpp (renamed from Tests/QtAutogen/complex/private_slot.cpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/private_slot.h (renamed from Tests/QtAutogen/complex/private_slot.h) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/resourcetester.cpp (renamed from Tests/QtAutogen/complex/resourcetester.cpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/resourcetester.h (renamed from Tests/QtAutogen/complex/resourcetester.h) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/second_resource.qrc (renamed from Tests/QtAutogen/complex/second_resource.qrc) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/second_widget.cpp (renamed from Tests/QtAutogen/complex/second_widget.cpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/second_widget.h (renamed from Tests/QtAutogen/complex/second_widget.h) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/second_widget.ui (renamed from Tests/QtAutogen/complex/second_widget.ui) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/sub/bar.h (renamed from Tests/QtAutogen/complex/sub/bar.h) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/targetObjectsTest.cpp (renamed from Tests/QtAutogen/complex/targetObjectsTest.cpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/test.qrc (renamed from Tests/QtAutogen/complex/test.qrc) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/widget1.ui (renamed from Tests/QtAutogen/complex/widget1.ui) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/widget2.ui (renamed from Tests/QtAutogen/complex/widget2.ui) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/xyz.cpp (renamed from Tests/QtAutogen/complex/xyz.cpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/xyz.h (renamed from Tests/QtAutogen/complex/xyz.h) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/yaf.cpp (renamed from Tests/QtAutogen/complex/yaf.cpp) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/yaf.h (renamed from Tests/QtAutogen/complex/yaf.h) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/Complex/yaf_p.h (renamed from Tests/QtAutogen/complex/yaf_p.h) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/defines_test/CMakeLists.txt | 4 | ||||
-rw-r--r-- | Tests/QtAutogen/defines_test/defines_test.cpp | 38 |
60 files changed, 5 insertions, 142 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 5608933..b0bf887 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1246,10 +1246,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release # the required dlls may not be in the PATH, so we can't run the executables # on that platform. if(WIN32) - set(run_autogen_test ${CMAKE_CTEST_COMMAND} -V) set(run_autouic_test ${CMAKE_CTEST_COMMAND} -V) else() - set(run_autogen_test complex/QtAutogen) set(run_autouic_test QtAutoUicInterface) endif() if(NOT CMAKE_CONFIGURATION_TYPES) @@ -1265,22 +1263,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release if(CMake_TEST_Qt5 AND Qt5Widgets_FOUND) add_subdirectory(Qt5Autogen) - add_test(NAME Qt5Autogen COMMAND ${CMAKE_CTEST_COMMAND} - --build-and-test - "${CMake_SOURCE_DIR}/Tests/QtAutogen" - "${CMake_BINARY_DIR}/Tests/Qt5Autogen" - ${build_generator_args} - --build-project QtAutogen - --build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt5Autogen" - --force-new-ctest-process - --build-options ${build_options} - -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} - -DQT_TEST_VERSION=5 - ${QtAutogen_BUILD_OPTIONS} - --test-command ${run_autogen_test} - ) - list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt5Autogen") - add_test(NAME Qt5AutogenRerun COMMAND ${CMAKE_CTEST_COMMAND} --build-and-test "${CMake_SOURCE_DIR}/Tests/QtAutogenRerun" @@ -1313,22 +1295,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release if(QT4_WORKS AND QT_QTGUI_FOUND) add_subdirectory(Qt4Autogen) - add_test(NAME Qt4Autogen COMMAND ${CMAKE_CTEST_COMMAND} - --build-and-test - "${CMake_SOURCE_DIR}/Tests/QtAutogen" - "${CMake_BINARY_DIR}/Tests/Qt4Autogen" - ${build_generator_args} - --build-project QtAutogen - --build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt4Autogen" - --force-new-ctest-process - --build-options ${build_options} - -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} - -DQT_TEST_VERSION=4 - ${QtAutogen_BUILD_OPTIONS} - --test-command ${run_autogen_test} - ) - list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Autogen") - add_test(NAME Qt4AutogenRerun COMMAND ${CMAKE_CTEST_COMMAND} --build-and-test "${CMake_SOURCE_DIR}/Tests/QtAutogenRerun" diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt deleted file mode 100644 index 833f64e..0000000 --- a/Tests/QtAutogen/CMakeLists.txt +++ /dev/null @@ -1,64 +0,0 @@ -cmake_minimum_required(VERSION 3.9) -cmake_policy(SET CMP0071 NEW) -project(QtAutogen) - -if (QT_TEST_VERSION STREQUAL 4) - find_package(Qt4 REQUIRED) - - # Include this directory before using the UseQt4 file. - add_subdirectory(defines_test) - - include(UseQt4) - - set(QT_QTCORE_TARGET Qt4::QtCore) - - macro(qtx_wrap_cpp) - qt4_wrap_cpp(${ARGN}) - endmacro() - macro(qtx_generate_moc) - qt4_generate_moc(${ARGN}) - endmacro() - -else() - if (NOT QT_TEST_VERSION STREQUAL 5) - message(SEND_ERROR "Invalid Qt version specified.") - endif() - find_package(Qt5Widgets REQUIRED) - - set(QT_QTCORE_TARGET Qt5::Core) - - include_directories(${Qt5Widgets_INCLUDE_DIRS}) - set(QT_LIBRARIES Qt5::Widgets) - - if(Qt5_POSITION_INDEPENDENT_CODE AND CMAKE_CXX_COMPILE_OPTIONS_PIC) - add_definitions(${CMAKE_CXX_COMPILE_OPTIONS_PIC}) - endif() - - macro(qtx_wrap_cpp) - qt5_wrap_cpp(${ARGN}) - endmacro() - macro(qtx_generate_moc) - qt5_generate_moc(${ARGN}) - endmacro() - -endif() - -get_property(QT_COMPILE_FEATURES TARGET ${QT_QTCORE_TARGET} PROPERTY INTERFACE_COMPILE_FEATURES) - -# Qt4 moc does not support utf8 paths in _parameter files generated by -# qtx_wrap_cpp -# https://bugreports.qt.io/browse/QTBUG-35480 -# Do a simple check if there is are non ASCII character in the build path -string(REGEX MATCH "[^ -~]+" NON_ASCII_BDIR ${CMAKE_CURRENT_BINARY_DIR}) -if((NOT NON_ASCII_BDIR) OR (NOT QT_TEST_VERSION STREQUAL 4)) - set(ALLOW_WRAP_CPP TRUE) -endif() -# On windows qtx_wrap_cpp also fails in Qt5 when used on a path that -# contains non ASCII characters -if(NON_ASCII_BDIR AND WIN32) - set(ALLOW_WRAP_CPP FALSE) -endif() - -# -- Test -# Complex test case -add_subdirectory(complex) diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake index 29bc4af..6921495 100644 --- a/Tests/QtAutogen/CommonTests.cmake +++ b/Tests/QtAutogen/CommonTests.cmake @@ -30,3 +30,4 @@ if(APPLE AND (NOT QT_TEST_VERSION STREQUAL 4)) endif() ADD_AUTOGEN_TEST(SameName sameName) ADD_AUTOGEN_TEST(StaticLibraryCycle slc) +ADD_AUTOGEN_TEST(Complex QtAutogen) diff --git a/Tests/QtAutogen/complex/Adir/CMakeLists.txt b/Tests/QtAutogen/Complex/Adir/CMakeLists.txt index a1c36ff..a1c36ff 100644 --- a/Tests/QtAutogen/complex/Adir/CMakeLists.txt +++ b/Tests/QtAutogen/Complex/Adir/CMakeLists.txt diff --git a/Tests/QtAutogen/complex/Adir/libA.cpp b/Tests/QtAutogen/Complex/Adir/libA.cpp index f79f24a..f79f24a 100644 --- a/Tests/QtAutogen/complex/Adir/libA.cpp +++ b/Tests/QtAutogen/Complex/Adir/libA.cpp diff --git a/Tests/QtAutogen/complex/Adir/libA.h b/Tests/QtAutogen/Complex/Adir/libA.h index c4eb9f7..c4eb9f7 100644 --- a/Tests/QtAutogen/complex/Adir/libA.h +++ b/Tests/QtAutogen/Complex/Adir/libA.h diff --git a/Tests/QtAutogen/complex/Bdir/CMakeLists.txt b/Tests/QtAutogen/Complex/Bdir/CMakeLists.txt index d338763..d338763 100644 --- a/Tests/QtAutogen/complex/Bdir/CMakeLists.txt +++ b/Tests/QtAutogen/Complex/Bdir/CMakeLists.txt diff --git a/Tests/QtAutogen/complex/Bdir/libB.cpp b/Tests/QtAutogen/Complex/Bdir/libB.cpp index d3b6753..d3b6753 100644 --- a/Tests/QtAutogen/complex/Bdir/libB.cpp +++ b/Tests/QtAutogen/Complex/Bdir/libB.cpp diff --git a/Tests/QtAutogen/complex/Bdir/libB.h b/Tests/QtAutogen/Complex/Bdir/libB.h index e4ab788..e4ab788 100644 --- a/Tests/QtAutogen/complex/Bdir/libB.h +++ b/Tests/QtAutogen/Complex/Bdir/libB.h diff --git a/Tests/QtAutogen/complex/CMakeLists.txt b/Tests/QtAutogen/Complex/CMakeLists.txt index 2043ccf..e9feea0 100644 --- a/Tests/QtAutogen/complex/CMakeLists.txt +++ b/Tests/QtAutogen/Complex/CMakeLists.txt @@ -1,4 +1,6 @@ -cmake_minimum_required(VERSION 3.9) +cmake_minimum_required(VERSION 3.10) +project(Complex) +include("../AutogenTest.cmake") # -- Test: AUTOMOC AUTORCC AUTOUIC add_definitions(-DFOO -DSomeDefine="Barx") @@ -20,7 +22,7 @@ add_custom_command( OUTPUT generated.txt COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/generated.txt.in" "${CMAKE_CURRENT_BINARY_DIR}/generated.txt" DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/generated.txt.in" - ) +) add_custom_target(generate_moc_input DEPENDS generated.txt diff --git a/Tests/QtAutogen/complex/abc.cpp b/Tests/QtAutogen/Complex/abc.cpp index 2929b92..2929b92 100644 --- a/Tests/QtAutogen/complex/abc.cpp +++ b/Tests/QtAutogen/Complex/abc.cpp diff --git a/Tests/QtAutogen/complex/abc.h b/Tests/QtAutogen/Complex/abc.h index ec5f411..ec5f411 100644 --- a/Tests/QtAutogen/complex/abc.h +++ b/Tests/QtAutogen/Complex/abc.h diff --git a/Tests/QtAutogen/complex/abc_p.h b/Tests/QtAutogen/Complex/abc_p.h index be98487..be98487 100644 --- a/Tests/QtAutogen/complex/abc_p.h +++ b/Tests/QtAutogen/Complex/abc_p.h diff --git a/Tests/QtAutogen/complex/bar.cpp b/Tests/QtAutogen/Complex/bar.cpp index 734bd7a..734bd7a 100644 --- a/Tests/QtAutogen/complex/bar.cpp +++ b/Tests/QtAutogen/Complex/bar.cpp diff --git a/Tests/QtAutogen/complex/blub.cpp b/Tests/QtAutogen/Complex/blub.cpp index 1c497e0..1c497e0 100644 --- a/Tests/QtAutogen/complex/blub.cpp +++ b/Tests/QtAutogen/Complex/blub.cpp diff --git a/Tests/QtAutogen/complex/blub.h b/Tests/QtAutogen/Complex/blub.h index ff79878..ff79878 100644 --- a/Tests/QtAutogen/complex/blub.h +++ b/Tests/QtAutogen/Complex/blub.h diff --git a/Tests/QtAutogen/complex/calwidget.cpp b/Tests/QtAutogen/Complex/calwidget.cpp index 380e982..380e982 100644 --- a/Tests/QtAutogen/complex/calwidget.cpp +++ b/Tests/QtAutogen/Complex/calwidget.cpp diff --git a/Tests/QtAutogen/complex/calwidget.h b/Tests/QtAutogen/Complex/calwidget.h index 084d959..084d959 100644 --- a/Tests/QtAutogen/complex/calwidget.h +++ b/Tests/QtAutogen/Complex/calwidget.h diff --git a/Tests/QtAutogen/complex/calwidget.ui b/Tests/QtAutogen/Complex/calwidget.ui index 1c245ca..1c245ca 100644 --- a/Tests/QtAutogen/complex/calwidget.ui +++ b/Tests/QtAutogen/Complex/calwidget.ui diff --git a/Tests/QtAutogen/complex/codeeditor.cpp b/Tests/QtAutogen/Complex/codeeditor.cpp index 0caf8a7..0caf8a7 100644 --- a/Tests/QtAutogen/complex/codeeditor.cpp +++ b/Tests/QtAutogen/Complex/codeeditor.cpp diff --git a/Tests/QtAutogen/complex/codeeditor.h b/Tests/QtAutogen/Complex/codeeditor.h index b410bd4..b410bd4 100644 --- a/Tests/QtAutogen/complex/codeeditor.h +++ b/Tests/QtAutogen/Complex/codeeditor.h diff --git a/Tests/QtAutogen/complex/debug_class.cpp b/Tests/QtAutogen/Complex/debug_class.cpp index 46b09e7..46b09e7 100644 --- a/Tests/QtAutogen/complex/debug_class.cpp +++ b/Tests/QtAutogen/Complex/debug_class.cpp diff --git a/Tests/QtAutogen/complex/debug_class.h b/Tests/QtAutogen/Complex/debug_class.h index c02f0ed..c02f0ed 100644 --- a/Tests/QtAutogen/complex/debug_class.h +++ b/Tests/QtAutogen/Complex/debug_class.h diff --git a/Tests/QtAutogen/complex/debug_class.ui b/Tests/QtAutogen/Complex/debug_class.ui index dc2e1ac..dc2e1ac 100644 --- a/Tests/QtAutogen/complex/debug_class.ui +++ b/Tests/QtAutogen/Complex/debug_class.ui diff --git a/Tests/QtAutogen/complex/debug_resource.qrc b/Tests/QtAutogen/Complex/debug_resource.qrc index db98b9b..db98b9b 100644 --- a/Tests/QtAutogen/complex/debug_resource.qrc +++ b/Tests/QtAutogen/Complex/debug_resource.qrc diff --git a/Tests/QtAutogen/complex/foo.cpp b/Tests/QtAutogen/Complex/foo.cpp index f665eee..f665eee 100644 --- a/Tests/QtAutogen/complex/foo.cpp +++ b/Tests/QtAutogen/Complex/foo.cpp diff --git a/Tests/QtAutogen/complex/foo.h b/Tests/QtAutogen/Complex/foo.h index 3e03fe6..3e03fe6 100644 --- a/Tests/QtAutogen/complex/foo.h +++ b/Tests/QtAutogen/Complex/foo.h diff --git a/Tests/QtAutogen/complex/gadget.cpp b/Tests/QtAutogen/Complex/gadget.cpp index 23d95fa..23d95fa 100644 --- a/Tests/QtAutogen/complex/gadget.cpp +++ b/Tests/QtAutogen/Complex/gadget.cpp diff --git a/Tests/QtAutogen/complex/gadget.h b/Tests/QtAutogen/Complex/gadget.h index 3253e31..3253e31 100644 --- a/Tests/QtAutogen/complex/gadget.h +++ b/Tests/QtAutogen/Complex/gadget.h diff --git a/Tests/QtAutogen/complex/generated.cpp b/Tests/QtAutogen/Complex/generated.cpp index d514c61..d514c61 100644 --- a/Tests/QtAutogen/complex/generated.cpp +++ b/Tests/QtAutogen/Complex/generated.cpp diff --git a/Tests/QtAutogen/complex/generated.h b/Tests/QtAutogen/Complex/generated.h index 62e1607..62e1607 100644 --- a/Tests/QtAutogen/complex/generated.h +++ b/Tests/QtAutogen/Complex/generated.h diff --git a/Tests/QtAutogen/complex/generated.txt.in b/Tests/QtAutogen/Complex/generated.txt.in index 77507bb..77507bb 100644 --- a/Tests/QtAutogen/complex/generated.txt.in +++ b/Tests/QtAutogen/Complex/generated.txt.in diff --git a/Tests/QtAutogen/complex/generated_resource.qrc.in b/Tests/QtAutogen/Complex/generated_resource.qrc.in index da5fa62..da5fa62 100644 --- a/Tests/QtAutogen/complex/generated_resource.qrc.in +++ b/Tests/QtAutogen/Complex/generated_resource.qrc.in diff --git a/Tests/QtAutogen/complex/libC.cpp b/Tests/QtAutogen/Complex/libC.cpp index a3acff1..a3acff1 100644 --- a/Tests/QtAutogen/complex/libC.cpp +++ b/Tests/QtAutogen/Complex/libC.cpp diff --git a/Tests/QtAutogen/complex/libC.h b/Tests/QtAutogen/Complex/libC.h index 3bc2bad..3bc2bad 100644 --- a/Tests/QtAutogen/complex/libC.h +++ b/Tests/QtAutogen/Complex/libC.h diff --git a/Tests/QtAutogen/complex/main.cpp b/Tests/QtAutogen/Complex/main.cpp index d557c70..d557c70 100644 --- a/Tests/QtAutogen/complex/main.cpp +++ b/Tests/QtAutogen/Complex/main.cpp diff --git a/Tests/QtAutogen/complex/multiplewidgets.cpp b/Tests/QtAutogen/Complex/multiplewidgets.cpp index fda36ea..fda36ea 100644 --- a/Tests/QtAutogen/complex/multiplewidgets.cpp +++ b/Tests/QtAutogen/Complex/multiplewidgets.cpp diff --git a/Tests/QtAutogen/complex/multiplewidgets.h b/Tests/QtAutogen/Complex/multiplewidgets.h index a4d0a50..a4d0a50 100644 --- a/Tests/QtAutogen/complex/multiplewidgets.h +++ b/Tests/QtAutogen/Complex/multiplewidgets.h diff --git a/Tests/QtAutogen/complex/myinterface.h.in b/Tests/QtAutogen/Complex/myinterface.h.in index c6c0ba1..c6c0ba1 100644 --- a/Tests/QtAutogen/complex/myinterface.h.in +++ b/Tests/QtAutogen/Complex/myinterface.h.in diff --git a/Tests/QtAutogen/complex/myotherinterface.h.in b/Tests/QtAutogen/Complex/myotherinterface.h.in index d21e7af..d21e7af 100644 --- a/Tests/QtAutogen/complex/myotherinterface.h.in +++ b/Tests/QtAutogen/Complex/myotherinterface.h.in diff --git a/Tests/QtAutogen/complex/private_slot.cpp b/Tests/QtAutogen/Complex/private_slot.cpp index ab1682a..ab1682a 100644 --- a/Tests/QtAutogen/complex/private_slot.cpp +++ b/Tests/QtAutogen/Complex/private_slot.cpp diff --git a/Tests/QtAutogen/complex/private_slot.h b/Tests/QtAutogen/Complex/private_slot.h index 8041eb2..8041eb2 100644 --- a/Tests/QtAutogen/complex/private_slot.h +++ b/Tests/QtAutogen/Complex/private_slot.h diff --git a/Tests/QtAutogen/complex/resourcetester.cpp b/Tests/QtAutogen/Complex/resourcetester.cpp index 4ecb6b4..4ecb6b4 100644 --- a/Tests/QtAutogen/complex/resourcetester.cpp +++ b/Tests/QtAutogen/Complex/resourcetester.cpp diff --git a/Tests/QtAutogen/complex/resourcetester.h b/Tests/QtAutogen/Complex/resourcetester.h index dbdb3ad..dbdb3ad 100644 --- a/Tests/QtAutogen/complex/resourcetester.h +++ b/Tests/QtAutogen/Complex/resourcetester.h diff --git a/Tests/QtAutogen/complex/second_resource.qrc b/Tests/QtAutogen/Complex/second_resource.qrc index 27bfb14..27bfb14 100644 --- a/Tests/QtAutogen/complex/second_resource.qrc +++ b/Tests/QtAutogen/Complex/second_resource.qrc diff --git a/Tests/QtAutogen/complex/second_widget.cpp b/Tests/QtAutogen/Complex/second_widget.cpp index c575f10..c575f10 100644 --- a/Tests/QtAutogen/complex/second_widget.cpp +++ b/Tests/QtAutogen/Complex/second_widget.cpp diff --git a/Tests/QtAutogen/complex/second_widget.h b/Tests/QtAutogen/Complex/second_widget.h index c7929c4..c7929c4 100644 --- a/Tests/QtAutogen/complex/second_widget.h +++ b/Tests/QtAutogen/Complex/second_widget.h diff --git a/Tests/QtAutogen/complex/second_widget.ui b/Tests/QtAutogen/Complex/second_widget.ui index 4effa58..4effa58 100644 --- a/Tests/QtAutogen/complex/second_widget.ui +++ b/Tests/QtAutogen/Complex/second_widget.ui diff --git a/Tests/QtAutogen/complex/sub/bar.h b/Tests/QtAutogen/Complex/sub/bar.h index e4093f6..e4093f6 100644 --- a/Tests/QtAutogen/complex/sub/bar.h +++ b/Tests/QtAutogen/Complex/sub/bar.h diff --git a/Tests/QtAutogen/complex/targetObjectsTest.cpp b/Tests/QtAutogen/Complex/targetObjectsTest.cpp index 766b775..766b775 100644 --- a/Tests/QtAutogen/complex/targetObjectsTest.cpp +++ b/Tests/QtAutogen/Complex/targetObjectsTest.cpp diff --git a/Tests/QtAutogen/complex/test.qrc b/Tests/QtAutogen/Complex/test.qrc index c3d4e3c..c3d4e3c 100644 --- a/Tests/QtAutogen/complex/test.qrc +++ b/Tests/QtAutogen/Complex/test.qrc diff --git a/Tests/QtAutogen/complex/widget1.ui b/Tests/QtAutogen/Complex/widget1.ui index 8fce81a..8fce81a 100644 --- a/Tests/QtAutogen/complex/widget1.ui +++ b/Tests/QtAutogen/Complex/widget1.ui diff --git a/Tests/QtAutogen/complex/widget2.ui b/Tests/QtAutogen/Complex/widget2.ui index 1f411b9..1f411b9 100644 --- a/Tests/QtAutogen/complex/widget2.ui +++ b/Tests/QtAutogen/Complex/widget2.ui diff --git a/Tests/QtAutogen/complex/xyz.cpp b/Tests/QtAutogen/Complex/xyz.cpp index e46c9d3..e46c9d3 100644 --- a/Tests/QtAutogen/complex/xyz.cpp +++ b/Tests/QtAutogen/Complex/xyz.cpp diff --git a/Tests/QtAutogen/complex/xyz.h b/Tests/QtAutogen/Complex/xyz.h index 8b813fd..8b813fd 100644 --- a/Tests/QtAutogen/complex/xyz.h +++ b/Tests/QtAutogen/Complex/xyz.h diff --git a/Tests/QtAutogen/complex/yaf.cpp b/Tests/QtAutogen/Complex/yaf.cpp index 70e26aa..70e26aa 100644 --- a/Tests/QtAutogen/complex/yaf.cpp +++ b/Tests/QtAutogen/Complex/yaf.cpp diff --git a/Tests/QtAutogen/complex/yaf.h b/Tests/QtAutogen/Complex/yaf.h index f271061..f271061 100644 --- a/Tests/QtAutogen/complex/yaf.h +++ b/Tests/QtAutogen/Complex/yaf.h diff --git a/Tests/QtAutogen/complex/yaf_p.h b/Tests/QtAutogen/Complex/yaf_p.h index ea5eed6..ea5eed6 100644 --- a/Tests/QtAutogen/complex/yaf_p.h +++ b/Tests/QtAutogen/Complex/yaf_p.h diff --git a/Tests/QtAutogen/defines_test/CMakeLists.txt b/Tests/QtAutogen/defines_test/CMakeLists.txt deleted file mode 100644 index 9ee9a22..0000000 --- a/Tests/QtAutogen/defines_test/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ - -add_executable(defines_test defines_test.cpp) -set_target_properties(defines_test PROPERTIES AUTOMOC TRUE) -target_link_libraries(defines_test Qt4::QtGui) diff --git a/Tests/QtAutogen/defines_test/defines_test.cpp b/Tests/QtAutogen/defines_test/defines_test.cpp deleted file mode 100644 index cf4e9cb..0000000 --- a/Tests/QtAutogen/defines_test/defines_test.cpp +++ /dev/null @@ -1,38 +0,0 @@ - -#include <QObject> - -#ifdef QT_GUI_LIB -#include <QTextDocument> - -class SomeDocument : public QTextDocument -{ - Q_OBJECT - -Q_SIGNALS: - void someSig(); -}; -#endif - -#ifdef QT_CORE_LIB -class SomeObject : public QObject -{ - Q_OBJECT - -Q_SIGNALS: - void someSig(); -}; -#endif - -int main(int argc, char** argv) -{ -#ifdef QT_CORE_LIB - QMetaObject sosmo = SomeObject::staticMetaObject; -#endif -#ifdef QT_GUI_LIB - QMetaObject sdsmo = SomeDocument::staticMetaObject; -#endif - - return 0; -} - -#include "defines_test.moc" |