From fb7e52ca3d920ca1de8b2abb23da3d83db988eca Mon Sep 17 00:00:00 2001 From: Sebastian Holtermann Date: Fri, 8 Dec 2017 19:15:26 +0100 Subject: [PATCH] Autogen: Tests: Separate MocMacroName test --- Tests/QtAutogen/CMakeLists.txt | 6 ------ Tests/QtAutogen/CommonTests.cmake | 3 +++ Tests/QtAutogen/MocMacroName/CMakeLists.txt | 17 +++++++++++++++++ .../CustomMacros.hpp | 0 .../{mocMacroName => MocMacroName}/Gadget.cpp | 2 +- .../{mocMacroName => MocMacroName}/Gadget.hpp | 8 ++++++-- .../{mocMacroName => MocMacroName}/Object.cpp | 1 + .../{mocMacroName => MocMacroName}/Object.hpp | 7 +++++-- .../Object1Aliased.cpp | 0 .../Object1Aliased.hpp | 0 .../Object2Aliased.cpp | 0 .../Object2Aliased.hpp | 0 .../{mocMacroName => MocMacroName}/main.cpp | 0 Tests/QtAutogen/mocMacroName/CMakeLists.txt | 8 -------- 14 files changed, 33 insertions(+), 19 deletions(-) create mode 100644 Tests/QtAutogen/MocMacroName/CMakeLists.txt rename Tests/QtAutogen/{mocMacroName => MocMacroName}/CustomMacros.hpp (100%) rename Tests/QtAutogen/{mocMacroName => MocMacroName}/Gadget.cpp (77%) rename Tests/QtAutogen/{mocMacroName => MocMacroName}/Gadget.hpp (55%) rename Tests/QtAutogen/{mocMacroName => MocMacroName}/Object.cpp (84%) rename Tests/QtAutogen/{mocMacroName => MocMacroName}/Object.hpp (63%) rename Tests/QtAutogen/{mocMacroName => MocMacroName}/Object1Aliased.cpp (100%) rename Tests/QtAutogen/{mocMacroName => MocMacroName}/Object1Aliased.hpp (100%) rename Tests/QtAutogen/{mocMacroName => MocMacroName}/Object2Aliased.cpp (100%) rename Tests/QtAutogen/{mocMacroName => MocMacroName}/Object2Aliased.hpp (100%) rename Tests/QtAutogen/{mocMacroName => MocMacroName}/main.cpp (100%) delete mode 100644 Tests/QtAutogen/mocMacroName/CMakeLists.txt diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt index e5940d84b8..6b54b1a319 100644 --- a/Tests/QtAutogen/CMakeLists.txt +++ b/Tests/QtAutogen/CMakeLists.txt @@ -59,12 +59,6 @@ if(NON_ASCII_BDIR AND WIN32) set(ALLOW_WRAP_CPP FALSE) endif() -# -- Test -# MOC AUTOMOC_MACRO_NAMES -if (NOT QT_TEST_VERSION STREQUAL 4) - add_subdirectory(mocMacroName) -endif() - # -- Test # Tests AUTOMOC with generated sources add_subdirectory(mocDepends) diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake index fdf41b6e65..6a92873bf1 100644 --- a/Tests/QtAutogen/CommonTests.cmake +++ b/Tests/QtAutogen/CommonTests.cmake @@ -12,3 +12,6 @@ if(QT_TEST_ALLOW_QT_MACROS) endif() ADD_AUTOGEN_TEST(UicSkipSource) ADD_AUTOGEN_TEST(RccSkipSource) +if(NOT QT_TEST_VERSION STREQUAL 4) + ADD_AUTOGEN_TEST(MocMacroName mocMacroName) +endif() diff --git a/Tests/QtAutogen/MocMacroName/CMakeLists.txt b/Tests/QtAutogen/MocMacroName/CMakeLists.txt new file mode 100644 index 0000000000..f0251a2a01 --- /dev/null +++ b/Tests/QtAutogen/MocMacroName/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 3.10) +project(MocMacroName) +include("../AutogenTest.cmake") + +# Test CMAKE_AUTOMOC_MACRO_NAMES and AUTOMOC_MACRO_NAMES +list(APPEND CMAKE_AUTOMOC_MACRO_NAMES "QO1_ALIAS") + +add_executable(mocMacroName + main.cpp + Gadget.cpp + Object.cpp + Object1Aliased.cpp + Object2Aliased.cpp +) +set_property(TARGET mocMacroName PROPERTY AUTOMOC ON) +set_property(TARGET mocMacroName APPEND PROPERTY AUTOMOC_MACRO_NAMES "QO2_ALIAS") +target_link_libraries(mocMacroName ${QT_LIBRARIES}) diff --git a/Tests/QtAutogen/mocMacroName/CustomMacros.hpp b/Tests/QtAutogen/MocMacroName/CustomMacros.hpp similarity index 100% rename from Tests/QtAutogen/mocMacroName/CustomMacros.hpp rename to Tests/QtAutogen/MocMacroName/CustomMacros.hpp diff --git a/Tests/QtAutogen/mocMacroName/Gadget.cpp b/Tests/QtAutogen/MocMacroName/Gadget.cpp similarity index 77% rename from Tests/QtAutogen/mocMacroName/Gadget.cpp rename to Tests/QtAutogen/MocMacroName/Gadget.cpp index 167faebd34..d7cb515901 100644 --- a/Tests/QtAutogen/mocMacroName/Gadget.cpp +++ b/Tests/QtAutogen/MocMacroName/Gadget.cpp @@ -1,6 +1,6 @@ #include "Gadget.hpp" Gadget::Gadget() - : test(0) + : _test(0) { } diff --git a/Tests/QtAutogen/mocMacroName/Gadget.hpp b/Tests/QtAutogen/MocMacroName/Gadget.hpp similarity index 55% rename from Tests/QtAutogen/mocMacroName/Gadget.hpp rename to Tests/QtAutogen/MocMacroName/Gadget.hpp index 2587ed2759..cab792edc2 100644 --- a/Tests/QtAutogen/mocMacroName/Gadget.hpp +++ b/Tests/QtAutogen/MocMacroName/Gadget.hpp @@ -6,10 +6,14 @@ class Gadget { Q_GADGET - Q_PROPERTY(int test MEMBER test) + Q_PROPERTY(int test READ getTest) public: Gadget(); - int test; + + int getTest() { return _test; } + +private: + int _test; }; #endif diff --git a/Tests/QtAutogen/mocMacroName/Object.cpp b/Tests/QtAutogen/MocMacroName/Object.cpp similarity index 84% rename from Tests/QtAutogen/mocMacroName/Object.cpp rename to Tests/QtAutogen/MocMacroName/Object.cpp index c0b4f33fc4..800ebf3da2 100644 --- a/Tests/QtAutogen/mocMacroName/Object.cpp +++ b/Tests/QtAutogen/MocMacroName/Object.cpp @@ -1,6 +1,7 @@ #include "Object.hpp" Object::Object() + : _test(0) { } diff --git a/Tests/QtAutogen/mocMacroName/Object.hpp b/Tests/QtAutogen/MocMacroName/Object.hpp similarity index 63% rename from Tests/QtAutogen/mocMacroName/Object.hpp rename to Tests/QtAutogen/MocMacroName/Object.hpp index 0c40824ad8..aadae1f6df 100644 --- a/Tests/QtAutogen/mocMacroName/Object.hpp +++ b/Tests/QtAutogen/MocMacroName/Object.hpp @@ -6,14 +6,17 @@ class Object : public QObject { Q_OBJECT - Q_PROPERTY(int test MEMBER test) + Q_PROPERTY(int test READ getTest) public: Object(); + int getTest() { return _test; } + Q_SLOT void aSlot(); - int test; +private: + int _test; }; #endif diff --git a/Tests/QtAutogen/mocMacroName/Object1Aliased.cpp b/Tests/QtAutogen/MocMacroName/Object1Aliased.cpp similarity index 100% rename from Tests/QtAutogen/mocMacroName/Object1Aliased.cpp rename to Tests/QtAutogen/MocMacroName/Object1Aliased.cpp diff --git a/Tests/QtAutogen/mocMacroName/Object1Aliased.hpp b/Tests/QtAutogen/MocMacroName/Object1Aliased.hpp similarity index 100% rename from Tests/QtAutogen/mocMacroName/Object1Aliased.hpp rename to Tests/QtAutogen/MocMacroName/Object1Aliased.hpp diff --git a/Tests/QtAutogen/mocMacroName/Object2Aliased.cpp b/Tests/QtAutogen/MocMacroName/Object2Aliased.cpp similarity index 100% rename from Tests/QtAutogen/mocMacroName/Object2Aliased.cpp rename to Tests/QtAutogen/MocMacroName/Object2Aliased.cpp diff --git a/Tests/QtAutogen/mocMacroName/Object2Aliased.hpp b/Tests/QtAutogen/MocMacroName/Object2Aliased.hpp similarity index 100% rename from Tests/QtAutogen/mocMacroName/Object2Aliased.hpp rename to Tests/QtAutogen/MocMacroName/Object2Aliased.hpp diff --git a/Tests/QtAutogen/mocMacroName/main.cpp b/Tests/QtAutogen/MocMacroName/main.cpp similarity index 100% rename from Tests/QtAutogen/mocMacroName/main.cpp rename to Tests/QtAutogen/MocMacroName/main.cpp diff --git a/Tests/QtAutogen/mocMacroName/CMakeLists.txt b/Tests/QtAutogen/mocMacroName/CMakeLists.txt deleted file mode 100644 index 08e6803143..0000000000 --- a/Tests/QtAutogen/mocMacroName/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -cmake_minimum_required(VERSION 3.9) - -list(APPEND CMAKE_AUTOMOC_MACRO_NAMES "QO1_ALIAS") - -add_executable(mmn main.cpp Gadget.cpp Object.cpp Object1Aliased.cpp Object2Aliased.cpp) -set_property(TARGET mmn PROPERTY AUTOMOC ON) -set_property(TARGET mmn APPEND PROPERTY AUTOMOC_MACRO_NAMES "QO2_ALIAS") -target_link_libraries(mmn ${QT_LIBRARIES})