diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-12-08 18:56:26 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2017-12-13 12:50:18 (GMT) |
| commit | 0b6ad59ea6b74379f4aefb42c2402355c393c656 (patch) | |
| tree | 7bdd003283e1d2e08ebfe0c34434d7acf45acebd /Tests | |
| parent | a2c4e3489d9ccd7150b6fda2ea7254c21dcde1b2 (diff) | |
| download | CMake-0b6ad59ea6b74379f4aefb42c2402355c393c656.zip CMake-0b6ad59ea6b74379f4aefb42c2402355c393c656.tar.gz CMake-0b6ad59ea6b74379f4aefb42c2402355c393c656.tar.bz2 | |
Autogen: Tests: Separate UicInclude test
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/QtAutogen/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Tests/QtAutogen/CommonTests.cmake | 1 | ||||
| -rw-r--r-- | Tests/QtAutogen/UicInclude/CMakeLists.txt (renamed from Tests/QtAutogen/uicInclude/CMakeLists.txt) | 5 | ||||
| -rw-r--r-- | Tests/QtAutogen/UicInclude/PageC.ui (renamed from Tests/QtAutogen/uicInclude/PageC.ui) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/UicInclude/PageC2.ui (renamed from Tests/QtAutogen/uicInclude/PageC2.ui) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/UicInclude/dirA/PageA.ui (renamed from Tests/QtAutogen/uicInclude/dirA/PageA.ui) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/UicInclude/dirB/PageB.ui (renamed from Tests/QtAutogen/uicInclude/dirB/PageB.ui) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/UicInclude/dirB/PageB2.ui (renamed from Tests/QtAutogen/uicInclude/dirB/PageB2.ui) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/UicInclude/dirB/subB/PageBsub.ui (renamed from Tests/QtAutogen/uicInclude/dirB/subB/PageBsub.ui) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/UicInclude/main.cpp (renamed from Tests/QtAutogen/uicInclude/main.cpp) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/UicInclude/main.hpp (renamed from Tests/QtAutogen/uicInclude/main.hpp) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/UicInclude/subC/PageCsub.ui (renamed from Tests/QtAutogen/uicInclude/subC/PageCsub.ui) | 0 |
12 files changed, 5 insertions, 5 deletions
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 index f62ebb0..56f76fb 100644 --- a/Tests/QtAutogen/uicInclude/CMakeLists.txt +++ b/Tests/QtAutogen/UicInclude/CMakeLists.txt @@ -1,5 +1,8 @@ -# Test moc include patterns +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) diff --git a/Tests/QtAutogen/uicInclude/PageC.ui b/Tests/QtAutogen/UicInclude/PageC.ui index bb2fb5e..bb2fb5e 100644 --- a/Tests/QtAutogen/uicInclude/PageC.ui +++ b/Tests/QtAutogen/UicInclude/PageC.ui diff --git a/Tests/QtAutogen/uicInclude/PageC2.ui b/Tests/QtAutogen/UicInclude/PageC2.ui index daab868..daab868 100644 --- a/Tests/QtAutogen/uicInclude/PageC2.ui +++ b/Tests/QtAutogen/UicInclude/PageC2.ui diff --git a/Tests/QtAutogen/uicInclude/dirA/PageA.ui b/Tests/QtAutogen/UicInclude/dirA/PageA.ui index dd81802..dd81802 100644 --- a/Tests/QtAutogen/uicInclude/dirA/PageA.ui +++ b/Tests/QtAutogen/UicInclude/dirA/PageA.ui diff --git a/Tests/QtAutogen/uicInclude/dirB/PageB.ui b/Tests/QtAutogen/UicInclude/dirB/PageB.ui index fa6dfa6..fa6dfa6 100644 --- a/Tests/QtAutogen/uicInclude/dirB/PageB.ui +++ b/Tests/QtAutogen/UicInclude/dirB/PageB.ui diff --git a/Tests/QtAutogen/uicInclude/dirB/PageB2.ui b/Tests/QtAutogen/UicInclude/dirB/PageB2.ui index 2225150..2225150 100644 --- a/Tests/QtAutogen/uicInclude/dirB/PageB2.ui +++ b/Tests/QtAutogen/UicInclude/dirB/PageB2.ui diff --git a/Tests/QtAutogen/uicInclude/dirB/subB/PageBsub.ui b/Tests/QtAutogen/UicInclude/dirB/subB/PageBsub.ui index 873016e..873016e 100644 --- a/Tests/QtAutogen/uicInclude/dirB/subB/PageBsub.ui +++ b/Tests/QtAutogen/UicInclude/dirB/subB/PageBsub.ui diff --git a/Tests/QtAutogen/uicInclude/main.cpp b/Tests/QtAutogen/UicInclude/main.cpp index c8e7609..c8e7609 100644 --- a/Tests/QtAutogen/uicInclude/main.cpp +++ b/Tests/QtAutogen/UicInclude/main.cpp diff --git a/Tests/QtAutogen/uicInclude/main.hpp b/Tests/QtAutogen/UicInclude/main.hpp index 58ddc26..58ddc26 100644 --- a/Tests/QtAutogen/uicInclude/main.hpp +++ b/Tests/QtAutogen/UicInclude/main.hpp diff --git a/Tests/QtAutogen/uicInclude/subC/PageCsub.ui b/Tests/QtAutogen/UicInclude/subC/PageCsub.ui index 0268326..0268326 100644 --- a/Tests/QtAutogen/uicInclude/subC/PageCsub.ui +++ b/Tests/QtAutogen/UicInclude/subC/PageCsub.ui |