diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-02-15 12:25:23 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-02-15 13:40:08 +0000 |
commit | 0c51a8756377c40180619046d07b35718fcf1784 (patch) | |
tree | 55b914cb04b0f3f6db476ea2a80ac8052b1c0abe /examples/network | |
parent | 09cc63d425dabfa37b406e7eb1cee627c2eabb67 (diff) |
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 <kai.koehne@qt.io>
Diffstat (limited to 'examples/network')
-rw-r--r-- | examples/network/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/network/torrent/.prev_CMakeLists.txt | 73 | ||||
-rw-r--r-- | examples/network/torrent/CMakeLists.txt | 3 | ||||
-rw-r--r-- | examples/network/torrent/addtorrentform.ui (renamed from examples/network/torrent/forms/addtorrentform.ui) | 0 | ||||
-rw-r--r-- | examples/network/torrent/torrent.pro | 2 |
5 files changed, 3 insertions, 77 deletions
diff --git a/examples/network/CMakeLists.txt b/examples/network/CMakeLists.txt index b6ae618d1d..c28c951b69 100644 --- 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 deleted file mode 100644 index bc3bf6a465..0000000000 --- a/examples/network/torrent/.prev_CMakeLists.txt +++ /dev/null @@ -1,73 +0,0 @@ -# Generated from torrent.pro. - -cmake_minimum_required(VERSION 3.14) -project(torrent LANGUAGES CXX) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/network/torrent") - -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Network) -find_package(Qt6 COMPONENTS Widgets) - -qt_add_executable(torrent - addtorrentdialog.cpp addtorrentdialog.h - 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 - peerwireclient.cpp peerwireclient.h - ratecontroller.cpp ratecontroller.h - torrentclient.cpp torrentclient.h - torrentserver.cpp torrentserver.h - trackerclient.cpp trackerclient.h -) -set_target_properties(torrent PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) -target_link_libraries(torrent PUBLIC - Qt::Core - Qt::Gui - Qt::Network - Qt::Widgets -) - - -# Resources: -set(icons_resource_files - "icons/1downarrow.png" - "icons/1uparrow.png" - "icons/bottom.png" - "icons/exit.png" - "icons/peertopeer.png" - "icons/player_pause.png" - "icons/player_play.png" - "icons/player_stop.png" -) - -qt6_add_resources(torrent "icons" - PREFIX - "/" - FILES - ${icons_resource_files} -) - -install(TARGETS torrent - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) 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 diff --git a/examples/network/torrent/forms/addtorrentform.ui b/examples/network/torrent/addtorrentform.ui index 950bb67119..950bb67119 100644 --- a/examples/network/torrent/forms/addtorrentform.ui +++ b/examples/network/torrent/addtorrentform.ui diff --git a/examples/network/torrent/torrent.pro b/examples/network/torrent/torrent.pro index c640c3b5d0..929c5cb784 100644 --- 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 |