From 0b6ad59ea6b74379f4aefb42c2402355c393c656 Mon Sep 17 00:00:00 2001 From: Sebastian Holtermann Date: Fri, 8 Dec 2017 19:56:26 +0100 Subject: Autogen: Tests: Separate UicInclude test --- Tests/QtAutogen/CMakeLists.txt | 4 ---- Tests/QtAutogen/CommonTests.cmake | 1 + Tests/QtAutogen/UicInclude/CMakeLists.txt | 11 +++++++++++ Tests/QtAutogen/UicInclude/PageC.ui | 24 ++++++++++++++++++++++++ Tests/QtAutogen/UicInclude/PageC2.ui | 24 ++++++++++++++++++++++++ Tests/QtAutogen/UicInclude/dirA/PageA.ui | 24 ++++++++++++++++++++++++ Tests/QtAutogen/UicInclude/dirB/PageB.ui | 24 ++++++++++++++++++++++++ Tests/QtAutogen/UicInclude/dirB/PageB2.ui | 24 ++++++++++++++++++++++++ Tests/QtAutogen/UicInclude/dirB/subB/PageBsub.ui | 24 ++++++++++++++++++++++++ Tests/QtAutogen/UicInclude/main.cpp | 18 ++++++++++++++++++ Tests/QtAutogen/UicInclude/main.hpp | 6 ++++++ Tests/QtAutogen/UicInclude/subC/PageCsub.ui | 24 ++++++++++++++++++++++++ Tests/QtAutogen/uicInclude/CMakeLists.txt | 8 -------- Tests/QtAutogen/uicInclude/PageC.ui | 24 ------------------------ Tests/QtAutogen/uicInclude/PageC2.ui | 24 ------------------------ Tests/QtAutogen/uicInclude/dirA/PageA.ui | 24 ------------------------ Tests/QtAutogen/uicInclude/dirB/PageB.ui | 24 ------------------------ Tests/QtAutogen/uicInclude/dirB/PageB2.ui | 24 ------------------------ Tests/QtAutogen/uicInclude/dirB/subB/PageBsub.ui | 24 ------------------------ Tests/QtAutogen/uicInclude/main.cpp | 18 ------------------ Tests/QtAutogen/uicInclude/main.hpp | 6 ------ Tests/QtAutogen/uicInclude/subC/PageCsub.ui | 24 ------------------------ 22 files changed, 204 insertions(+), 204 deletions(-) create mode 100644 Tests/QtAutogen/UicInclude/CMakeLists.txt create mode 100644 Tests/QtAutogen/UicInclude/PageC.ui create mode 100644 Tests/QtAutogen/UicInclude/PageC2.ui create mode 100644 Tests/QtAutogen/UicInclude/dirA/PageA.ui create mode 100644 Tests/QtAutogen/UicInclude/dirB/PageB.ui create mode 100644 Tests/QtAutogen/UicInclude/dirB/PageB2.ui create mode 100644 Tests/QtAutogen/UicInclude/dirB/subB/PageBsub.ui create mode 100644 Tests/QtAutogen/UicInclude/main.cpp create mode 100644 Tests/QtAutogen/UicInclude/main.hpp create mode 100644 Tests/QtAutogen/UicInclude/subC/PageCsub.ui delete mode 100644 Tests/QtAutogen/uicInclude/CMakeLists.txt delete mode 100644 Tests/QtAutogen/uicInclude/PageC.ui delete mode 100644 Tests/QtAutogen/uicInclude/PageC2.ui delete mode 100644 Tests/QtAutogen/uicInclude/dirA/PageA.ui delete mode 100644 Tests/QtAutogen/uicInclude/dirB/PageB.ui delete mode 100644 Tests/QtAutogen/uicInclude/dirB/PageB2.ui delete mode 100644 Tests/QtAutogen/uicInclude/dirB/subB/PageBsub.ui delete mode 100644 Tests/QtAutogen/uicInclude/main.cpp delete mode 100644 Tests/QtAutogen/uicInclude/main.hpp delete mode 100644 Tests/QtAutogen/uicInclude/subC/PageCsub.ui diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt index 1f50931..288ae60 100644 --- a/Tests/QtAutogen/CMakeLists.txt +++ b/Tests/QtAutogen/CMakeLists.txt @@ -60,10 +60,6 @@ if(NON_ASCII_BDIR AND WIN32) endif() # -- Test -# Tests various .ui include directories -add_subdirectory(uicInclude) - -# -- Test # OBJECT libraries add_subdirectory(objectLibrary) diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake index 932169b..e873d06 100644 --- a/Tests/QtAutogen/CommonTests.cmake +++ b/Tests/QtAutogen/CommonTests.cmake @@ -23,3 +23,4 @@ endif() if(QT_TEST_ALLOW_QT_MACROS) ADD_AUTOGEN_TEST(MocCMP0071) endif() +ADD_AUTOGEN_TEST(UicInclude uicInclude) diff --git a/Tests/QtAutogen/UicInclude/CMakeLists.txt b/Tests/QtAutogen/UicInclude/CMakeLists.txt new file mode 100644 index 0000000..56f76fb --- /dev/null +++ b/Tests/QtAutogen/UicInclude/CMakeLists.txt @@ -0,0 +1,11 @@ +cmake_minimum_required(VERSION 3.10) +project(UicInclude) +include("../AutogenTest.cmake") + +# Test uic include patterns +set(CMAKE_AUTOUIC_SEARCH_PATHS "dirA") + +add_executable(uicInclude main.cpp) +target_link_libraries(uicInclude ${QT_LIBRARIES}) +set_target_properties(uicInclude PROPERTIES AUTOUIC ON) +set_property(TARGET uicInclude APPEND PROPERTY AUTOUIC_SEARCH_PATHS "dirB") diff --git a/Tests/QtAutogen/UicInclude/PageC.ui b/Tests/QtAutogen/UicInclude/PageC.ui new file mode 100644 index 0000000..bb2fb5e --- /dev/null +++ b/Tests/QtAutogen/UicInclude/PageC.ui @@ -0,0 +1,24 @@ + + + PageC + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + + + + + + diff --git a/Tests/QtAutogen/UicInclude/PageC2.ui b/Tests/QtAutogen/UicInclude/PageC2.ui new file mode 100644 index 0000000..daab868 --- /dev/null +++ b/Tests/QtAutogen/UicInclude/PageC2.ui @@ -0,0 +1,24 @@ + + + PageC2 + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + + + + + + diff --git a/Tests/QtAutogen/UicInclude/dirA/PageA.ui b/Tests/QtAutogen/UicInclude/dirA/PageA.ui new file mode 100644 index 0000000..dd81802 --- /dev/null +++ b/Tests/QtAutogen/UicInclude/dirA/PageA.ui @@ -0,0 +1,24 @@ + + + PageA + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + + + + + + diff --git a/Tests/QtAutogen/UicInclude/dirB/PageB.ui b/Tests/QtAutogen/UicInclude/dirB/PageB.ui new file mode 100644 index 0000000..fa6dfa6 --- /dev/null +++ b/Tests/QtAutogen/UicInclude/dirB/PageB.ui @@ -0,0 +1,24 @@ + + + PageB + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + + + + + + diff --git a/Tests/QtAutogen/UicInclude/dirB/PageB2.ui b/Tests/QtAutogen/UicInclude/dirB/PageB2.ui new file mode 100644 index 0000000..2225150 --- /dev/null +++ b/Tests/QtAutogen/UicInclude/dirB/PageB2.ui @@ -0,0 +1,24 @@ + + + PageB2 + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + + + + + + diff --git a/Tests/QtAutogen/UicInclude/dirB/subB/PageBsub.ui b/Tests/QtAutogen/UicInclude/dirB/subB/PageBsub.ui new file mode 100644 index 0000000..873016e --- /dev/null +++ b/Tests/QtAutogen/UicInclude/dirB/subB/PageBsub.ui @@ -0,0 +1,24 @@ + + + PageBsub + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + + + + + + diff --git a/Tests/QtAutogen/UicInclude/main.cpp b/Tests/QtAutogen/UicInclude/main.cpp new file mode 100644 index 0000000..c8e7609 --- /dev/null +++ b/Tests/QtAutogen/UicInclude/main.cpp @@ -0,0 +1,18 @@ + +#include "main.hpp" + +int main(int argv, char** args) +{ + return 0; +} + +// .ui files in CMAKE_AUTOUIC_SEARCH_PATHS +#include "ui_PageA.h" +// .ui files in AUTOUIC_SEARCH_PATHS +#include "sub/gen/deep/ui_PageB2.h" +#include "subB/ui_PageBsub.h" +#include "ui_PageB.h" +// .ui files in source's vicinity +#include "sub/gen/deep/ui_PageC2.h" +#include "subC/ui_PageCsub.h" +#include "ui_PageC.h" diff --git a/Tests/QtAutogen/UicInclude/main.hpp b/Tests/QtAutogen/UicInclude/main.hpp new file mode 100644 index 0000000..58ddc26 --- /dev/null +++ b/Tests/QtAutogen/UicInclude/main.hpp @@ -0,0 +1,6 @@ +#ifndef MAIN_HPP +#define MAIN_HPP + +#include "ui_PageA.h" + +#endif diff --git a/Tests/QtAutogen/UicInclude/subC/PageCsub.ui b/Tests/QtAutogen/UicInclude/subC/PageCsub.ui new file mode 100644 index 0000000..0268326 --- /dev/null +++ b/Tests/QtAutogen/UicInclude/subC/PageCsub.ui @@ -0,0 +1,24 @@ + + + PageCsub + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + + + + + + diff --git a/Tests/QtAutogen/uicInclude/CMakeLists.txt b/Tests/QtAutogen/uicInclude/CMakeLists.txt deleted file mode 100644 index f62ebb0..0000000 --- a/Tests/QtAutogen/uicInclude/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Test moc include patterns - -set(CMAKE_AUTOUIC_SEARCH_PATHS "dirA") - -add_executable(uicInclude main.cpp) -target_link_libraries(uicInclude ${QT_LIBRARIES}) -set_target_properties(uicInclude PROPERTIES AUTOUIC ON) -set_property(TARGET uicInclude APPEND PROPERTY AUTOUIC_SEARCH_PATHS "dirB") diff --git a/Tests/QtAutogen/uicInclude/PageC.ui b/Tests/QtAutogen/uicInclude/PageC.ui deleted file mode 100644 index bb2fb5e..0000000 --- a/Tests/QtAutogen/uicInclude/PageC.ui +++ /dev/null @@ -1,24 +0,0 @@ - - - PageC - - - - 0 - 0 - 400 - 300 - - - - Form - - - - - - - - - - diff --git a/Tests/QtAutogen/uicInclude/PageC2.ui b/Tests/QtAutogen/uicInclude/PageC2.ui deleted file mode 100644 index daab868..0000000 --- a/Tests/QtAutogen/uicInclude/PageC2.ui +++ /dev/null @@ -1,24 +0,0 @@ - - - PageC2 - - - - 0 - 0 - 400 - 300 - - - - Form - - - - - - - - - - diff --git a/Tests/QtAutogen/uicInclude/dirA/PageA.ui b/Tests/QtAutogen/uicInclude/dirA/PageA.ui deleted file mode 100644 index dd81802..0000000 --- a/Tests/QtAutogen/uicInclude/dirA/PageA.ui +++ /dev/null @@ -1,24 +0,0 @@ - - - PageA - - - - 0 - 0 - 400 - 300 - - - - Form - - - - - - - - - - diff --git a/Tests/QtAutogen/uicInclude/dirB/PageB.ui b/Tests/QtAutogen/uicInclude/dirB/PageB.ui deleted file mode 100644 index fa6dfa6..0000000 --- a/Tests/QtAutogen/uicInclude/dirB/PageB.ui +++ /dev/null @@ -1,24 +0,0 @@ - - - PageB - - - - 0 - 0 - 400 - 300 - - - - Form - - - - - - - - - - diff --git a/Tests/QtAutogen/uicInclude/dirB/PageB2.ui b/Tests/QtAutogen/uicInclude/dirB/PageB2.ui deleted file mode 100644 index 2225150..0000000 --- a/Tests/QtAutogen/uicInclude/dirB/PageB2.ui +++ /dev/null @@ -1,24 +0,0 @@ - - - PageB2 - - - - 0 - 0 - 400 - 300 - - - - Form - - - - - - - - - - diff --git a/Tests/QtAutogen/uicInclude/dirB/subB/PageBsub.ui b/Tests/QtAutogen/uicInclude/dirB/subB/PageBsub.ui deleted file mode 100644 index 873016e..0000000 --- a/Tests/QtAutogen/uicInclude/dirB/subB/PageBsub.ui +++ /dev/null @@ -1,24 +0,0 @@ - - - PageBsub - - - - 0 - 0 - 400 - 300 - - - - Form - - - - - - - - - - diff --git a/Tests/QtAutogen/uicInclude/main.cpp b/Tests/QtAutogen/uicInclude/main.cpp deleted file mode 100644 index c8e7609..0000000 --- a/Tests/QtAutogen/uicInclude/main.cpp +++ /dev/null @@ -1,18 +0,0 @@ - -#include "main.hpp" - -int main(int argv, char** args) -{ - return 0; -} - -// .ui files in CMAKE_AUTOUIC_SEARCH_PATHS -#include "ui_PageA.h" -// .ui files in AUTOUIC_SEARCH_PATHS -#include "sub/gen/deep/ui_PageB2.h" -#include "subB/ui_PageBsub.h" -#include "ui_PageB.h" -// .ui files in source's vicinity -#include "sub/gen/deep/ui_PageC2.h" -#include "subC/ui_PageCsub.h" -#include "ui_PageC.h" diff --git a/Tests/QtAutogen/uicInclude/main.hpp b/Tests/QtAutogen/uicInclude/main.hpp deleted file mode 100644 index 58ddc26..0000000 --- a/Tests/QtAutogen/uicInclude/main.hpp +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef MAIN_HPP -#define MAIN_HPP - -#include "ui_PageA.h" - -#endif diff --git a/Tests/QtAutogen/uicInclude/subC/PageCsub.ui b/Tests/QtAutogen/uicInclude/subC/PageCsub.ui deleted file mode 100644 index 0268326..0000000 --- a/Tests/QtAutogen/uicInclude/subC/PageCsub.ui +++ /dev/null @@ -1,24 +0,0 @@ - - - PageCsub - - - - 0 - 0 - 400 - 300 - - - - Form - - - - - - - - - - -- cgit v0.12