From e485ba12193d36ffc4faee89bb80dbe611ad7e82 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Fri, 11 Oct 2013 14:17:32 +0200 Subject: [PATCH] Rename the QtAutomoc tests to QtAutogen. --- Tests/CMakeLists.txt | 24 +++++++++---------- .../Adir/CMakeLists.txt | 0 Tests/{QtAutomoc => QtAutogen}/Adir/libA.cpp | 0 Tests/{QtAutomoc => QtAutogen}/Adir/libA.h | 0 .../Bdir/CMakeLists.txt | 0 Tests/{QtAutomoc => QtAutogen}/Bdir/libB.cpp | 0 Tests/{QtAutomoc => QtAutogen}/Bdir/libB.h | 0 Tests/{QtAutomoc => QtAutogen}/CMakeLists.txt | 2 +- Tests/{QtAutomoc => QtAutogen}/abc.cpp | 0 Tests/{QtAutomoc => QtAutogen}/abc.h | 0 Tests/{QtAutomoc => QtAutogen}/abc_p.h | 0 Tests/{QtAutomoc => QtAutogen}/bar.cpp | 0 Tests/{QtAutomoc => QtAutogen}/blub.cpp | 0 Tests/{QtAutomoc => QtAutogen}/blub.h | 0 Tests/{QtAutomoc => QtAutogen}/calwidget.cpp | 0 Tests/{QtAutomoc => QtAutogen}/calwidget.h | 0 Tests/{QtAutomoc => QtAutogen}/codeeditor.cpp | 0 Tests/{QtAutomoc => QtAutogen}/codeeditor.h | 0 .../defines_test/CMakeLists.txt | 0 .../defines_test/defines_test.cpp | 0 Tests/{QtAutomoc => QtAutogen}/empty.cpp | 0 Tests/{QtAutomoc => QtAutogen}/empty.h | 0 Tests/{QtAutomoc => QtAutogen}/foo.cpp | 0 Tests/{QtAutomoc => QtAutogen}/foo.h | 0 Tests/{QtAutomoc => QtAutogen}/gadget.cpp | 0 Tests/{QtAutomoc => QtAutogen}/gadget.h | 0 Tests/{QtAutomoc => QtAutogen}/libC.cpp | 0 Tests/{QtAutomoc => QtAutogen}/libC.h | 0 Tests/{QtAutomoc => QtAutogen}/main.cpp | 0 .../{QtAutomoc => QtAutogen}/private_slot.cpp | 0 Tests/{QtAutomoc => QtAutogen}/private_slot.h | 0 Tests/{QtAutomoc => QtAutogen}/sub/bar.h | 0 Tests/{QtAutomoc => QtAutogen}/xyz.cpp | 0 Tests/{QtAutomoc => QtAutogen}/xyz.h | 0 Tests/{QtAutomoc => QtAutogen}/yaf.cpp | 0 Tests/{QtAutomoc => QtAutogen}/yaf.h | 0 Tests/{QtAutomoc => QtAutogen}/yaf_p.h | 0 37 files changed, 13 insertions(+), 13 deletions(-) rename Tests/{QtAutomoc => QtAutogen}/Adir/CMakeLists.txt (100%) rename Tests/{QtAutomoc => QtAutogen}/Adir/libA.cpp (100%) rename Tests/{QtAutomoc => QtAutogen}/Adir/libA.h (100%) rename Tests/{QtAutomoc => QtAutogen}/Bdir/CMakeLists.txt (100%) rename Tests/{QtAutomoc => QtAutogen}/Bdir/libB.cpp (100%) rename Tests/{QtAutomoc => QtAutogen}/Bdir/libB.h (100%) rename Tests/{QtAutomoc => QtAutogen}/CMakeLists.txt (99%) rename Tests/{QtAutomoc => QtAutogen}/abc.cpp (100%) rename Tests/{QtAutomoc => QtAutogen}/abc.h (100%) rename Tests/{QtAutomoc => QtAutogen}/abc_p.h (100%) rename Tests/{QtAutomoc => QtAutogen}/bar.cpp (100%) rename Tests/{QtAutomoc => QtAutogen}/blub.cpp (100%) rename Tests/{QtAutomoc => QtAutogen}/blub.h (100%) rename Tests/{QtAutomoc => QtAutogen}/calwidget.cpp (100%) rename Tests/{QtAutomoc => QtAutogen}/calwidget.h (100%) rename Tests/{QtAutomoc => QtAutogen}/codeeditor.cpp (100%) rename Tests/{QtAutomoc => QtAutogen}/codeeditor.h (100%) rename Tests/{QtAutomoc => QtAutogen}/defines_test/CMakeLists.txt (100%) rename Tests/{QtAutomoc => QtAutogen}/defines_test/defines_test.cpp (100%) rename Tests/{QtAutomoc => QtAutogen}/empty.cpp (100%) rename Tests/{QtAutomoc => QtAutogen}/empty.h (100%) rename Tests/{QtAutomoc => QtAutogen}/foo.cpp (100%) rename Tests/{QtAutomoc => QtAutogen}/foo.h (100%) rename Tests/{QtAutomoc => QtAutogen}/gadget.cpp (100%) rename Tests/{QtAutomoc => QtAutogen}/gadget.h (100%) rename Tests/{QtAutomoc => QtAutogen}/libC.cpp (100%) rename Tests/{QtAutomoc => QtAutogen}/libC.h (100%) rename Tests/{QtAutomoc => QtAutogen}/main.cpp (100%) rename Tests/{QtAutomoc => QtAutogen}/private_slot.cpp (100%) rename Tests/{QtAutomoc => QtAutogen}/private_slot.h (100%) rename Tests/{QtAutomoc => QtAutogen}/sub/bar.h (100%) rename Tests/{QtAutomoc => QtAutogen}/xyz.cpp (100%) rename Tests/{QtAutomoc => QtAutogen}/xyz.h (100%) rename Tests/{QtAutomoc => QtAutogen}/yaf.cpp (100%) rename Tests/{QtAutomoc => QtAutogen}/yaf.h (100%) rename Tests/{QtAutomoc => QtAutogen}/yaf_p.h (100%) diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index b9c99e33e..38b2a0c03 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1031,32 +1031,32 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ find_package(Qt5Widgets QUIET NO_MODULE) if(Qt5Widgets_FOUND) - add_test(Qt5Automoc ${CMAKE_CTEST_COMMAND} + add_test(Qt5Autogen ${CMAKE_CTEST_COMMAND} --build-and-test - "${CMake_SOURCE_DIR}/Tests/QtAutomoc" - "${CMake_BINARY_DIR}/Tests/Qt5Automoc" + "${CMake_SOURCE_DIR}/Tests/QtAutogen" + "${CMake_BINARY_DIR}/Tests/Qt5Autogen" ${build_generator_args} - --build-project QtAutomoc - --build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt5Automoc" + --build-project QtAutogen + --build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt5Autogen" --force-new-ctest-process --build-options -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} -DQT_TEST_VERSION=5 --test-command ${CMAKE_CTEST_COMMAND} -V ) - list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt5Automoc") + list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt5Autogen") endif() if(QT4_WORKS AND QT_QTGUI_FOUND) - add_test(Qt4Automoc ${CMAKE_CTEST_COMMAND} + add_test(Qt4Autogen ${CMAKE_CTEST_COMMAND} --build-and-test - "${CMake_SOURCE_DIR}/Tests/QtAutomoc" - "${CMake_BINARY_DIR}/Tests/Qt4Automoc" + "${CMake_SOURCE_DIR}/Tests/QtAutogen" + "${CMake_BINARY_DIR}/Tests/Qt4Autogen" ${build_generator_args} - --build-project QtAutomoc - --build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt4Automoc" + --build-project QtAutogen + --build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt4Autogen" --force-new-ctest-process --build-options -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} -DQT_TEST_VERSION=4 --test-command ${CMAKE_CTEST_COMMAND} -V ) - list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Automoc") + list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Autogen") add_test(Qt4Targets ${CMAKE_CTEST_COMMAND} --build-and-test diff --git a/Tests/QtAutomoc/Adir/CMakeLists.txt b/Tests/QtAutogen/Adir/CMakeLists.txt similarity index 100% rename from Tests/QtAutomoc/Adir/CMakeLists.txt rename to Tests/QtAutogen/Adir/CMakeLists.txt diff --git a/Tests/QtAutomoc/Adir/libA.cpp b/Tests/QtAutogen/Adir/libA.cpp similarity index 100% rename from Tests/QtAutomoc/Adir/libA.cpp rename to Tests/QtAutogen/Adir/libA.cpp diff --git a/Tests/QtAutomoc/Adir/libA.h b/Tests/QtAutogen/Adir/libA.h similarity index 100% rename from Tests/QtAutomoc/Adir/libA.h rename to Tests/QtAutogen/Adir/libA.h diff --git a/Tests/QtAutomoc/Bdir/CMakeLists.txt b/Tests/QtAutogen/Bdir/CMakeLists.txt similarity index 100% rename from Tests/QtAutomoc/Bdir/CMakeLists.txt rename to Tests/QtAutogen/Bdir/CMakeLists.txt diff --git a/Tests/QtAutomoc/Bdir/libB.cpp b/Tests/QtAutogen/Bdir/libB.cpp similarity index 100% rename from Tests/QtAutomoc/Bdir/libB.cpp rename to Tests/QtAutogen/Bdir/libB.cpp diff --git a/Tests/QtAutomoc/Bdir/libB.h b/Tests/QtAutogen/Bdir/libB.h similarity index 100% rename from Tests/QtAutomoc/Bdir/libB.h rename to Tests/QtAutogen/Bdir/libB.h diff --git a/Tests/QtAutomoc/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt similarity index 99% rename from Tests/QtAutomoc/CMakeLists.txt rename to Tests/QtAutogen/CMakeLists.txt index 8ad693af3..a7f553fe5 100644 --- a/Tests/QtAutomoc/CMakeLists.txt +++ b/Tests/QtAutogen/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.8) -project(QtAutomoc) +project(QtAutogen) if (QT_TEST_VERSION STREQUAL 4) find_package(Qt4 REQUIRED) diff --git a/Tests/QtAutomoc/abc.cpp b/Tests/QtAutogen/abc.cpp similarity index 100% rename from Tests/QtAutomoc/abc.cpp rename to Tests/QtAutogen/abc.cpp diff --git a/Tests/QtAutomoc/abc.h b/Tests/QtAutogen/abc.h similarity index 100% rename from Tests/QtAutomoc/abc.h rename to Tests/QtAutogen/abc.h diff --git a/Tests/QtAutomoc/abc_p.h b/Tests/QtAutogen/abc_p.h similarity index 100% rename from Tests/QtAutomoc/abc_p.h rename to Tests/QtAutogen/abc_p.h diff --git a/Tests/QtAutomoc/bar.cpp b/Tests/QtAutogen/bar.cpp similarity index 100% rename from Tests/QtAutomoc/bar.cpp rename to Tests/QtAutogen/bar.cpp diff --git a/Tests/QtAutomoc/blub.cpp b/Tests/QtAutogen/blub.cpp similarity index 100% rename from Tests/QtAutomoc/blub.cpp rename to Tests/QtAutogen/blub.cpp diff --git a/Tests/QtAutomoc/blub.h b/Tests/QtAutogen/blub.h similarity index 100% rename from Tests/QtAutomoc/blub.h rename to Tests/QtAutogen/blub.h diff --git a/Tests/QtAutomoc/calwidget.cpp b/Tests/QtAutogen/calwidget.cpp similarity index 100% rename from Tests/QtAutomoc/calwidget.cpp rename to Tests/QtAutogen/calwidget.cpp diff --git a/Tests/QtAutomoc/calwidget.h b/Tests/QtAutogen/calwidget.h similarity index 100% rename from Tests/QtAutomoc/calwidget.h rename to Tests/QtAutogen/calwidget.h diff --git a/Tests/QtAutomoc/codeeditor.cpp b/Tests/QtAutogen/codeeditor.cpp similarity index 100% rename from Tests/QtAutomoc/codeeditor.cpp rename to Tests/QtAutogen/codeeditor.cpp diff --git a/Tests/QtAutomoc/codeeditor.h b/Tests/QtAutogen/codeeditor.h similarity index 100% rename from Tests/QtAutomoc/codeeditor.h rename to Tests/QtAutogen/codeeditor.h diff --git a/Tests/QtAutomoc/defines_test/CMakeLists.txt b/Tests/QtAutogen/defines_test/CMakeLists.txt similarity index 100% rename from Tests/QtAutomoc/defines_test/CMakeLists.txt rename to Tests/QtAutogen/defines_test/CMakeLists.txt diff --git a/Tests/QtAutomoc/defines_test/defines_test.cpp b/Tests/QtAutogen/defines_test/defines_test.cpp similarity index 100% rename from Tests/QtAutomoc/defines_test/defines_test.cpp rename to Tests/QtAutogen/defines_test/defines_test.cpp diff --git a/Tests/QtAutomoc/empty.cpp b/Tests/QtAutogen/empty.cpp similarity index 100% rename from Tests/QtAutomoc/empty.cpp rename to Tests/QtAutogen/empty.cpp diff --git a/Tests/QtAutomoc/empty.h b/Tests/QtAutogen/empty.h similarity index 100% rename from Tests/QtAutomoc/empty.h rename to Tests/QtAutogen/empty.h diff --git a/Tests/QtAutomoc/foo.cpp b/Tests/QtAutogen/foo.cpp similarity index 100% rename from Tests/QtAutomoc/foo.cpp rename to Tests/QtAutogen/foo.cpp diff --git a/Tests/QtAutomoc/foo.h b/Tests/QtAutogen/foo.h similarity index 100% rename from Tests/QtAutomoc/foo.h rename to Tests/QtAutogen/foo.h diff --git a/Tests/QtAutomoc/gadget.cpp b/Tests/QtAutogen/gadget.cpp similarity index 100% rename from Tests/QtAutomoc/gadget.cpp rename to Tests/QtAutogen/gadget.cpp diff --git a/Tests/QtAutomoc/gadget.h b/Tests/QtAutogen/gadget.h similarity index 100% rename from Tests/QtAutomoc/gadget.h rename to Tests/QtAutogen/gadget.h diff --git a/Tests/QtAutomoc/libC.cpp b/Tests/QtAutogen/libC.cpp similarity index 100% rename from Tests/QtAutomoc/libC.cpp rename to Tests/QtAutogen/libC.cpp diff --git a/Tests/QtAutomoc/libC.h b/Tests/QtAutogen/libC.h similarity index 100% rename from Tests/QtAutomoc/libC.h rename to Tests/QtAutogen/libC.h diff --git a/Tests/QtAutomoc/main.cpp b/Tests/QtAutogen/main.cpp similarity index 100% rename from Tests/QtAutomoc/main.cpp rename to Tests/QtAutogen/main.cpp diff --git a/Tests/QtAutomoc/private_slot.cpp b/Tests/QtAutogen/private_slot.cpp similarity index 100% rename from Tests/QtAutomoc/private_slot.cpp rename to Tests/QtAutogen/private_slot.cpp diff --git a/Tests/QtAutomoc/private_slot.h b/Tests/QtAutogen/private_slot.h similarity index 100% rename from Tests/QtAutomoc/private_slot.h rename to Tests/QtAutogen/private_slot.h diff --git a/Tests/QtAutomoc/sub/bar.h b/Tests/QtAutogen/sub/bar.h similarity index 100% rename from Tests/QtAutomoc/sub/bar.h rename to Tests/QtAutogen/sub/bar.h diff --git a/Tests/QtAutomoc/xyz.cpp b/Tests/QtAutogen/xyz.cpp similarity index 100% rename from Tests/QtAutomoc/xyz.cpp rename to Tests/QtAutogen/xyz.cpp diff --git a/Tests/QtAutomoc/xyz.h b/Tests/QtAutogen/xyz.h similarity index 100% rename from Tests/QtAutomoc/xyz.h rename to Tests/QtAutogen/xyz.h diff --git a/Tests/QtAutomoc/yaf.cpp b/Tests/QtAutogen/yaf.cpp similarity index 100% rename from Tests/QtAutomoc/yaf.cpp rename to Tests/QtAutogen/yaf.cpp diff --git a/Tests/QtAutomoc/yaf.h b/Tests/QtAutogen/yaf.h similarity index 100% rename from Tests/QtAutomoc/yaf.h rename to Tests/QtAutogen/yaf.h diff --git a/Tests/QtAutomoc/yaf_p.h b/Tests/QtAutogen/yaf_p.h similarity index 100% rename from Tests/QtAutomoc/yaf_p.h rename to Tests/QtAutogen/yaf_p.h