diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-05-23 10:44:52 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-05-23 08:59:35 +0000 |
commit | 837f592c5e98d8d06854421cadb6a4fd2c0a7a3d (patch) | |
tree | 67a6a1fac52eaf62e0b8d6887a459d20a008406b /examples/network | |
parent | fa21d29b7506e21db8a433e117aebb9f3c724f03 (diff) |
Regenerate more projects that are using uic
Amends fa21d29b7506e21db8a433e117aebb9f3c724f03
Change-Id: I54d9cca77122d61016e06c4057949747b19472bb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'examples/network')
-rw-r--r-- | examples/network/securesocketclient/CMakeLists.txt | 4 | ||||
-rw-r--r-- | examples/network/secureudpclient/CMakeLists.txt | 8 | ||||
-rw-r--r-- | examples/network/secureudpserver/CMakeLists.txt | 8 | ||||
-rw-r--r-- | examples/network/torrent/.prev_CMakeLists.txt | 42 | ||||
-rw-r--r-- | examples/network/torrent/CMakeLists.txt | 6 |
5 files changed, 59 insertions, 9 deletions
diff --git a/examples/network/securesocketclient/CMakeLists.txt b/examples/network/securesocketclient/CMakeLists.txt index e6fdd6b2ca..fd9a12e4bb 100644 --- a/examples/network/securesocketclient/CMakeLists.txt +++ b/examples/network/securesocketclient/CMakeLists.txt @@ -13,9 +13,11 @@ add_qt_executable(securesocketclient main.cpp sslclient.cpp sslclient.h sslclient.ui sslerrors.ui - LIBRARIES + PUBLIC_LIBRARIES Qt::Network Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic ) # Resources: diff --git a/examples/network/secureudpclient/CMakeLists.txt b/examples/network/secureudpclient/CMakeLists.txt index 02dfd77fe0..5516b36cc3 100644 --- a/examples/network/secureudpclient/CMakeLists.txt +++ b/examples/network/secureudpclient/CMakeLists.txt @@ -13,10 +13,12 @@ add_qt_executable(secureudpclient association.cpp association.h main.cpp mainwindow.cpp mainwindow.h mainwindow.ui - LIBRARIES - Qt::Widgets + PUBLIC_LIBRARIES Qt::Network + Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic ) -#### Keys ignored in scope 1:.:secureudpclient.pro:<NONE>: +#### Keys ignored in scope 1:.:.:secureudpclient.pro:<TRUE>: # TEMPLATE = "app" diff --git a/examples/network/secureudpserver/CMakeLists.txt b/examples/network/secureudpserver/CMakeLists.txt index c7d97420ae..6d4968c9f7 100644 --- a/examples/network/secureudpserver/CMakeLists.txt +++ b/examples/network/secureudpserver/CMakeLists.txt @@ -13,10 +13,12 @@ add_qt_executable(secureudpserver mainwindow.cpp mainwindow.h mainwindow.ui nicselector.cpp nicselector.h nicselector.ui server.cpp server.h - LIBRARIES - Qt::Widgets + PUBLIC_LIBRARIES Qt::Network + Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic ) -#### Keys ignored in scope 1:.:secureudpserver.pro:<NONE>: +#### Keys ignored in scope 1:.:.:secureudpserver.pro:<TRUE>: # TEMPLATE = "app" diff --git a/examples/network/torrent/.prev_CMakeLists.txt b/examples/network/torrent/.prev_CMakeLists.txt new file mode 100644 index 0000000000..5d23f5e74b --- /dev/null +++ b/examples/network/torrent/.prev_CMakeLists.txt @@ -0,0 +1,42 @@ +# Generated from torrent.pro. + +##################################################################### +## torrent Binary: +##################################################################### + +add_qt_executable(torrent + GUI + OUTPUT_DIRECTORY "${INSTALL_EXAMPLESDIR}/network/torrent" + INSTALL_DIRECTORY "${INSTALL_EXAMPLESDIR}/network/torrent" + SOURCES + 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 + PUBLIC_LIBRARIES + Qt::Network + Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic +) + +# Resources: +add_qt_resource(torrent "icons" PREFIX "/" 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) + diff --git a/examples/network/torrent/CMakeLists.txt b/examples/network/torrent/CMakeLists.txt index f8cbc071ff..448335e7aa 100644 --- a/examples/network/torrent/CMakeLists.txt +++ b/examples/network/torrent/CMakeLists.txt @@ -22,11 +22,13 @@ add_qt_executable(torrent torrentclient.cpp torrentclient.h torrentserver.cpp torrentserver.h trackerclient.cpp trackerclient.h - INCLUDE_DIRECTORIES + INCLUDE_DIRECTORIES # special case forms # special case - LIBRARIES + PUBLIC_LIBRARIES Qt::Network Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic ) # Resources: |