diff options
| author | Stephen Kelly <steveire@gmail.com> | 2014-02-02 12:19:27 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-02-04 18:21:43 (GMT) |
| commit | 6053ce22f69f58c9dc4db66dbfe62cdd8fbe2774 (patch) | |
| tree | 8b1edb7c8940d5e7981a17df0fa6fdfc8cf7b875 /Tests | |
| parent | 1fc9ecfae63447f9109475c1b1ffb6a2974458d9 (diff) | |
| download | CMake-6053ce22f69f58c9dc4db66dbfe62cdd8fbe2774.zip CMake-6053ce22f69f58c9dc4db66dbfe62cdd8fbe2774.tar.gz CMake-6053ce22f69f58c9dc4db66dbfe62cdd8fbe2774.tar.bz2 | |
QtAutogen: Make uic work even when the source is in a subdir.
Modify the includedUis to store the path to the file which includes
the ui file. Reuse that path to generate the output file from the
uic process.
Diffstat (limited to 'Tests')
| -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 |