diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-03-22 15:59:35 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-03-22 20:09:42 +0100 |
| commit | 1165df7b6ee2eb7fdf37843b2fdf04eb75d04963 (patch) | |
| tree | 6fcee141bbfed1389ffbca597161819602e2b0ef /examples | |
| parent | b7598eaafb79e20d3e9e838c295fb7db35c4bdf9 (diff) | |
| download | qtsvg-1165df7b6ee2eb7fdf37843b2fdf04eb75d04963.tar.gz | |
CMake: Fix build of svggenerator example
CMake's AUTOUIC behavior is slightly different from qmake's .ui file
handling. The file including ui_foo.h can't directly include it
if the ui file is in a subfolder.
Adjust AUTOUIC search paths by setting the AUTOUIC_SEARCH_PATHS
target property.
Amends c2ccbdd1eb5a367c2778caed091b25dddc895129
Pick-to: 6.1
Fixes: QTBUG-91893
Task-number: QTBUG-77812
Change-Id: I01e8943d0a3bb9dedd7af3ef96add23f30b493f8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/svg/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/svg/svggenerator/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/examples/svg/CMakeLists.txt b/examples/svg/CMakeLists.txt index c9596e3..16c34c2 100644 --- a/examples/svg/CMakeLists.txt +++ b/examples/svg/CMakeLists.txt @@ -5,6 +5,6 @@ add_subdirectory(richtext) add_subdirectory(draganddrop) if(TARGET Qt::Widgets) add_subdirectory(embeddedsvgviewer) -# add_subdirectory(svggenerator) # special case + add_subdirectory(svggenerator) add_subdirectory(svgviewer) endif() diff --git a/examples/svg/svggenerator/CMakeLists.txt b/examples/svg/svggenerator/CMakeLists.txt index 82616ab..6c33315 100644 --- a/examples/svg/svggenerator/CMakeLists.txt +++ b/examples/svg/svggenerator/CMakeLists.txt @@ -33,7 +33,9 @@ set_target_properties(svggenerator PROPERTIES target_include_directories(svggenerator PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) - +set_target_properties(svggenerator PROPERTIES + AUTOUIC_SEARCH_PATHS + "${CMAKE_CURRENT_SOURCE_DIR}/forms") target_link_libraries(svggenerator PUBLIC Qt::Core Qt::Gui |