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 Pick-to: 6.1 Change-Id: Ic2dec5ded7100e22d5afc571efc4b009bc62e41c Reviewed-by: Kai Koehne <[email protected]>
blockspacer · Feb 15, 2021 · 0c51a87 · 0c51a87
1 parent 09cc63d
commit 0c51a87
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 77 deletions.
diff --git a/examples/network/CMakeLists.txt b/examples/network/CMakeLists.txt
@@ -16,7 +16,7 @@ if(TARGET Qt::Widgets)
     add_subdirectory(loopback)
     add_subdirectory(threadedfortuneserver)
     add_subdirectory(googlesuggest)
-    # add_subdirectory(torrent) FIXME: This does not find its ui file:-/ # special case
+    add_subdirectory(torrent)
     add_subdirectory(multicastreceiver)
     add_subdirectory(multicastsender)
     add_subdirectory(fortuneclient)

diff --git a/examples/network/torrent/.prev_CMakeLists.txt b/examples/network/torrent/.prev_CMakeLists.txt
diff --git 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

diff --git a/...s/network/torrent/forms/addtorrentform.ui → examples/network/torrent/addtorrentform.ui b/...s/network/torrent/forms/addtorrentform.ui → examples/network/torrent/addtorrentform.ui
diff --git a/examples/network/torrent/torrent.pro b/examples/network/torrent/torrent.pro
@@ -27,7 +27,7 @@ SOURCES += main.cpp \
            trackerclient.cpp
 
 # Forms and resources
-FORMS += forms/addtorrentform.ui
+FORMS += addtorrentform.ui
 RESOURCES += icons.qrc
 
 # install