From 90860224c81afc2a1733117a7bea0d21f47b83fb Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 15 Feb 2021 12:25:23 +0100 Subject: Fix CMake build of network/torrent example The ui_XXX.h include did not match the location of the XXX.ui file, and AUTOUIC failed with "SRC:/addtorrentdialog.h" includes the uic file "ui_addtorrentform.h", but the user interface file "addtorrentform.ui" could not be found in the following directories "SRC:" While this could be fixed by adjusting the include paths properly, this would complicate the CMake project file, and we're dealing with an example where needless complexity would cloud comprehensibility. Move the .ui file next to corresponding source files instead. This removes the need for any special cases in CMakeLists.txt, and we can remove .prev_CMakeLists.txt. Fixes: QTBUG-87457 Change-Id: Ic2dec5ded7100e22d5afc571efc4b009bc62e41c Reviewed-by: Kai Koehne (cherry picked from commit 0c51a8756377c40180619046d07b35718fcf1784) Reviewed-by: Qt Cherry-pick Bot --- examples/network/torrent/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'examples/network/torrent/CMakeLists.txt') diff --git a/examples/network/torrent/CMakeLists.txt b/examples/network/torrent/CMakeLists.txt index 7eea3d02bc..0d1f6735e3 100644 --- a/examples/network/torrent/CMakeLists.txt +++ b/examples/network/torrent/CMakeLists.txt @@ -22,10 +22,10 @@ find_package(Qt6 COMPONENTS Widgets) qt_add_executable(torrent addtorrentdialog.cpp addtorrentdialog.h + addtorrentform.ui bencodeparser.cpp bencodeparser.h connectionmanager.cpp connectionmanager.h filemanager.cpp filemanager.h - forms/addtorrentform.ui main.cpp mainwindow.cpp mainwindow.h metainfo.cpp metainfo.h @@ -39,7 +39,6 @@ set_target_properties(torrent PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) -target_include_directories(torrent PUBLIC forms) # special case target_link_libraries(torrent PUBLIC Qt::Core Qt::Gui -- cgit v1.2.3