diff options
| author | Brad King <brad.king@kitware.com> | 2014-02-04 18:34:54 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-02-04 18:34:54 (GMT) |
| commit | f748b59e2057d73a25448378442d70b420ed7698 (patch) | |
| tree | 0035234f8941db728f48c6485da9e5575aa34fbc /Tests/QtAutogen | |
| parent | 01a41bc98ca8f2451e69fde4ac513b57276809ff (diff) | |
| parent | 6053ce22f69f58c9dc4db66dbfe62cdd8fbe2774 (diff) | |
| download | CMake-f748b59e2057d73a25448378442d70b420ed7698.zip CMake-f748b59e2057d73a25448378442d70b420ed7698.tar.gz CMake-f748b59e2057d73a25448378442d70b420ed7698.tar.bz2 | |
Merge topic 'fix-Qt-autogen'
6053ce22 QtAutogen: Make uic work even when the source is in a subdir.
1fc9ecfa FindQt4: Make AUTOMOC work regardless which order Qt 4/5 is found.
Diffstat (limited to 'Tests/QtAutogen')
| -rw-r--r-- | Tests/QtAutogen/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Tests/QtAutogen/sub/uiconly.cpp (renamed from Tests/QtAutogen/uiconly.cpp) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/sub/uiconly.h (renamed from Tests/QtAutogen/uiconly.h) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/sub/uiconly.ui (renamed from Tests/QtAutogen/uiconly.ui) | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt index 515bf5b..546ed02 100644 --- a/Tests/QtAutogen/CMakeLists.txt +++ b/Tests/QtAutogen/CMakeLists.txt @@ -88,6 +88,6 @@ target_link_libraries(empty no_link_language) add_library(no_link_language STATIC empty.h) set_target_properties(no_link_language PROPERTIES AUTOMOC TRUE) -qtx_wrap_cpp(uicOnlyMoc uiconly.h) -add_executable(uiconly uiconly.cpp ${uicOnlyMoc}) +qtx_wrap_cpp(uicOnlyMoc sub/uiconly.h) +add_executable(uiconly sub/uiconly.cpp ${uicOnlyMoc}) target_link_libraries(uiconly ${QT_LIBRARIES}) diff --git a/Tests/QtAutogen/uiconly.cpp b/Tests/QtAutogen/sub/uiconly.cpp index cdb3318..cdb3318 100644 --- a/Tests/QtAutogen/uiconly.cpp +++ b/Tests/QtAutogen/sub/uiconly.cpp diff --git a/Tests/QtAutogen/uiconly.h b/Tests/QtAutogen/sub/uiconly.h index 9e21f82..9e21f82 100644 --- a/Tests/QtAutogen/uiconly.h +++ b/Tests/QtAutogen/sub/uiconly.h diff --git a/Tests/QtAutogen/uiconly.ui b/Tests/QtAutogen/sub/uiconly.ui index 13fb832..13fb832 100644 --- a/Tests/QtAutogen/uiconly.ui +++ b/Tests/QtAutogen/sub/uiconly.ui |