0c51a87563
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>
39 lines
1.1 KiB
CMake
39 lines
1.1 KiB
CMake
# Generated from network.pro.
|
|
|
|
if(NOT TARGET Qt::Network)
|
|
return()
|
|
endif()
|
|
add_subdirectory(download)
|
|
add_subdirectory(downloadmanager)
|
|
if(NOT INTEGRITY)
|
|
add_subdirectory(dnslookup)
|
|
endif()
|
|
if(TARGET Qt::Widgets)
|
|
add_subdirectory(blockingfortuneclient)
|
|
add_subdirectory(broadcastreceiver)
|
|
add_subdirectory(broadcastsender)
|
|
add_subdirectory(http)
|
|
add_subdirectory(loopback)
|
|
add_subdirectory(threadedfortuneserver)
|
|
add_subdirectory(googlesuggest)
|
|
add_subdirectory(torrent)
|
|
add_subdirectory(multicastreceiver)
|
|
add_subdirectory(multicastsender)
|
|
add_subdirectory(fortuneclient)
|
|
add_subdirectory(fortuneserver)
|
|
endif()
|
|
if(QT_FEATURE_processenvironment AND TARGET Qt::Widgets)
|
|
add_subdirectory(network-chat)
|
|
endif()
|
|
if(QT_FEATURE_ssl AND TARGET Qt::Widgets)
|
|
add_subdirectory(securesocketclient)
|
|
endif()
|
|
if(QT_FEATURE_dtls AND TARGET Qt::Widgets)
|
|
add_subdirectory(secureudpserver)
|
|
add_subdirectory(secureudpclient)
|
|
endif()
|
|
if(QT_FEATURE_sctp AND TARGET Qt::Widgets)
|
|
add_subdirectory(multistreamserver)
|
|
add_subdirectory(multistreamclient)
|
|
endif()
|