diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-12-08 16:38:13 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2017-12-13 12:48:27 (GMT) |
| commit | 6273b8354902e1af124d6f9b4a0ba23cf5e8a9b9 (patch) | |
| tree | a029fed808dab3f7202be7bc6519701aae445888 | |
| parent | 0b8597a86ee8bed2c34f52d309fd57b5f29a1595 (diff) | |
| download | CMake-6273b8354902e1af124d6f9b4a0ba23cf5e8a9b9.zip CMake-6273b8354902e1af124d6f9b4a0ba23cf5e8a9b9.tar.gz CMake-6273b8354902e1af124d6f9b4a0ba23cf5e8a9b9.tar.bz2 | |
Autogen: Tests: Separate uicOnly test
| -rw-r--r-- | Tests/QtAutogen/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | Tests/QtAutogen/CommonTests.cmake | 3 | ||||
| -rw-r--r-- | Tests/QtAutogen/UicOnly/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | Tests/QtAutogen/UicOnly/uiconly.cpp (renamed from Tests/QtAutogen/uicOnlySource/uiconly.cpp) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/UicOnly/uiconly.h (renamed from Tests/QtAutogen/uicOnlySource/uiconly.h) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/UicOnly/uiconly.ui (renamed from Tests/QtAutogen/uicOnlySource/uiconly.ui) | 0 |
6 files changed, 13 insertions, 9 deletions
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt index 160903a..85029d1 100644 --- a/Tests/QtAutogen/CMakeLists.txt +++ b/Tests/QtAutogen/CMakeLists.txt @@ -60,15 +60,6 @@ if(NON_ASCII_BDIR AND WIN32) endif() # -- Test -# UIC only -if(ALLOW_WRAP_CPP) - qtx_wrap_cpp(uicOnlyMoc uicOnlySource/uiconly.h) - add_executable(uicOnly uicOnlySource/uiconly.cpp ${uicOnlyMoc}) - set_property(TARGET uicOnly PROPERTY AUTOUIC ON) - target_link_libraries(uicOnly ${QT_LIBRARIES}) -endif() - -# -- Test # RCC only add_executable(rccOnly rccOnly.cpp rccOnlyRes.qrc) set_property(TARGET rccOnly PROPERTY AUTORCC ON) diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake index 5abbee5..9121f41 100644 --- a/Tests/QtAutogen/CommonTests.cmake +++ b/Tests/QtAutogen/CommonTests.cmake @@ -1,3 +1,6 @@ # Autogen tests common for Qt4 and Qt5 ADD_AUTOGEN_TEST(MocOnly mocOnly) ADD_AUTOGEN_TEST(MocOptions mocOptions) +if(QT_TEST_ALLOW_QT_MACROS) + ADD_AUTOGEN_TEST(UicOnly uicOnly) +endif() diff --git a/Tests/QtAutogen/UicOnly/CMakeLists.txt b/Tests/QtAutogen/UicOnly/CMakeLists.txt new file mode 100644 index 0000000..89a9a1b --- /dev/null +++ b/Tests/QtAutogen/UicOnly/CMakeLists.txt @@ -0,0 +1,10 @@ +cmake_minimum_required(VERSION 3.10) +project(UicOnly) +include("../AutogenTest.cmake") + +# Test AUTOUIC being enabled only +# The moc is provided by the Qt macro +qtx_wrap_cpp(uicOnlyMoc uiconly.h) +add_executable(uicOnly uiconly.cpp ${uicOnlyMoc}) +set_property(TARGET uicOnly PROPERTY AUTOUIC ON) +target_link_libraries(uicOnly ${QT_LIBRARIES}) diff --git a/Tests/QtAutogen/uicOnlySource/uiconly.cpp b/Tests/QtAutogen/UicOnly/uiconly.cpp index 7b91b25..7b91b25 100644 --- a/Tests/QtAutogen/uicOnlySource/uiconly.cpp +++ b/Tests/QtAutogen/UicOnly/uiconly.cpp diff --git a/Tests/QtAutogen/uicOnlySource/uiconly.h b/Tests/QtAutogen/UicOnly/uiconly.h index 8f4eebe..8f4eebe 100644 --- a/Tests/QtAutogen/uicOnlySource/uiconly.h +++ b/Tests/QtAutogen/UicOnly/uiconly.h diff --git a/Tests/QtAutogen/uicOnlySource/uiconly.ui b/Tests/QtAutogen/UicOnly/uiconly.ui index 13fb832..13fb832 100644 --- a/Tests/QtAutogen/uicOnlySource/uiconly.ui +++ b/Tests/QtAutogen/UicOnly/uiconly.ui |