Skip to content

Commit

Permalink
CMake: Regenerate examples to use qt_add_executable
Browse files Browse the repository at this point in the history 
Task-number: QTBUG-87661
Change-Id: I0dacfdc97a3fb7d88da85b67800f2c1b084d869b
Reviewed-by: Joerg Bornemann <[email protected]>
  • Loading branch information
@alcroito
alcroito committed Oct 19, 2020
1 parent c3fee0d commit 2ffbac7
Show file tree
Hide file tree
Showing 262 changed files with 288 additions and 268 deletions.
2 changes: 1 addition & 1 deletion examples/corelib/ipc/localfortuneclient/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Network)
find_package(Qt6 COMPONENTS Widgets)

add_qt_gui_executable(localfortuneclient
qt_add_executable(localfortuneclient
client.cpp client.h
main.cpp
)
Expand Down
2 changes: 1 addition & 1 deletion examples/corelib/ipc/localfortuneserver/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Network)
find_package(Qt6 COMPONENTS Widgets)

add_qt_gui_executable(localfortuneserver
qt_add_executable(localfortuneserver
main.cpp
server.cpp server.h
)
Expand Down
2 changes: 1 addition & 1 deletion examples/corelib/ipc/sharedmemory/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Widgets)

add_qt_gui_executable(sharedmemory
qt_add_executable(sharedmemory
dialog.cpp dialog.h dialog.ui
main.cpp
)
Expand Down
2 changes: 1 addition & 1 deletion examples/corelib/mimetypes/mimetypebrowser/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Widgets)

add_executable(mimetypebrowser
qt_add_executable(mimetypebrowser
main.cpp
mainwindow.cpp mainwindow.h
mimetypemodel.cpp mimetypemodel.h
Expand Down
2 changes: 1 addition & 1 deletion examples/corelib/serialization/cbordump/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/corelib/serialization/cbordump")

find_package(Qt6 COMPONENTS Core)

add_executable(cbordump
qt_add_executable(cbordump
main.cpp
)
target_link_libraries(cbordump PUBLIC
Expand Down
2 changes: 1 addition & 1 deletion examples/corelib/serialization/convert/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/corelib/serialization/convert")

find_package(Qt6 COMPONENTS Core)

add_executable(convert
qt_add_executable(convert
cborconverter.cpp cborconverter.h
converter.h
datastreamconverter.cpp datastreamconverter.h
Expand Down
2 changes: 1 addition & 1 deletion examples/corelib/serialization/savegame/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/corelib/serialization/savegame")

find_package(Qt6 COMPONENTS Core)

add_executable(savegame
qt_add_executable(savegame
character.cpp character.h
game.cpp game.h
level.cpp level.h
Expand Down
2 changes: 1 addition & 1 deletion examples/corelib/threads/mandelbrot/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Widgets)

add_qt_gui_executable(mandelbrot
qt_add_executable(mandelbrot
main.cpp
mandelbrotwidget.cpp mandelbrotwidget.h
renderthread.cpp renderthread.h
Expand Down
2 changes: 1 addition & 1 deletion examples/corelib/threads/queuedcustomtype/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Widgets)

add_qt_gui_executable(queuedcustomtype
qt_add_executable(queuedcustomtype
block.cpp block.h
main.cpp
renderthread.cpp renderthread.h
Expand Down
2 changes: 1 addition & 1 deletion examples/corelib/threads/semaphores/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/corelib/threads/semaphores")

find_package(Qt6 COMPONENTS Core)

add_executable(semaphores
qt_add_executable(semaphores
semaphores.cpp
)
target_link_libraries(semaphores PUBLIC
Expand Down
2 changes: 1 addition & 1 deletion examples/corelib/threads/waitconditions/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/corelib/threads/waitconditions")

find_package(Qt6 COMPONENTS Core)

add_executable(waitconditions
qt_add_executable(waitconditions
waitconditions.cpp
)
target_link_libraries(waitconditions PUBLIC
Expand Down
2 changes: 1 addition & 1 deletion examples/corelib/tools/contiguouscache/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Widgets)

add_qt_gui_executable(contiguouscache
qt_add_executable(contiguouscache
main.cpp
randomlistmodel.cpp randomlistmodel.h
)
Expand Down
2 changes: 1 addition & 1 deletion examples/corelib/tools/customtype/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Widgets)

add_qt_gui_executable(customtype
qt_add_executable(customtype
main.cpp
message.cpp message.h
)
Expand Down
2 changes: 1 addition & 1 deletion examples/corelib/tools/customtypesending/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Widgets)

add_qt_gui_executable(customtypesending
qt_add_executable(customtypesending
main.cpp
message.cpp message.h
window.cpp window.h
Expand Down
2 changes: 1 addition & 1 deletion examples/dbus/chat/.prev_CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS DBus)
find_package(Qt6 COMPONENTS Widgets)

add_qt_gui_executable(chat
qt_add_executable(chat
chat.cpp chat.h
chatmainwindow.ui
chatsetnickname.ui
Expand Down
2 changes: 1 addition & 1 deletion examples/dbus/chat/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ qt6_add_dbus_adaptor(chat_SRCS
chat_adaptor
)
# special case end
add_qt_gui_executable(chat
qt_add_executable(chat
chat.cpp chat.h
chatmainwindow.ui
chatsetnickname.ui
Expand Down
4 changes: 2 additions & 2 deletions examples/dbus/complexpingpong/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/dbus/complexpingpong")

find_package(Qt6 COMPONENTS DBus)

add_qt_gui_executable(complexping
qt_add_executable(complexping
complexping.cpp complexping.h
ping-common.h
)
Expand Down Expand Up @@ -48,7 +48,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/dbus/complexpingpong")

find_package(Qt6 COMPONENTS DBus)

add_qt_gui_executable(complexpong
qt_add_executable(complexpong
complexpong.cpp complexpong.h
)
target_link_libraries(complexpong PUBLIC
Expand Down
2 changes: 1 addition & 1 deletion examples/dbus/listnames/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/dbus/listnames")
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS DBus)

add_qt_gui_executable(listnames
qt_add_executable(listnames
listnames.cpp
)
target_link_libraries(listnames PUBLIC
Expand Down
4 changes: 2 additions & 2 deletions examples/dbus/pingpong/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/dbus/pingpong")

find_package(Qt6 COMPONENTS DBus)

add_qt_gui_executable(ping
qt_add_executable(ping
ping.cpp
ping-common.h
)
Expand Down Expand Up @@ -48,7 +48,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/dbus/pingpong")

find_package(Qt6 COMPONENTS DBus)

add_qt_gui_executable(pong
qt_add_executable(pong
ping-common.h
pong.cpp pong.h
)
Expand Down
2 changes: 1 addition & 1 deletion examples/dbus/remotecontrolledcar/car/.prev_CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS DBus)
find_package(Qt6 COMPONENTS Widgets)

add_qt_gui_executable(car
qt_add_executable(car
car.cpp car.h
main.cpp
)
Expand Down
2 changes: 1 addition & 1 deletion examples/dbus/remotecontrolledcar/car/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ qt6_add_dbus_adaptor(car_SRCS
car_adaptor
)
# special case end
add_qt_gui_executable(car
qt_add_executable(car
car.cpp car.h
main.cpp
${car_SRCS} # special case
Expand Down
2 changes: 1 addition & 1 deletion examples/dbus/remotecontrolledcar/controller/.prev_CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS DBus)
find_package(Qt6 COMPONENTS Widgets)

add_qt_gui_executable(controller
qt_add_executable(controller
controller.cpp controller.h controller.ui
main.cpp
)
Expand Down
2 changes: 1 addition & 1 deletion examples/dbus/remotecontrolledcar/controller/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ qt6_add_dbus_interface(controller_SRCS
car_interface
)
# special case end
add_qt_gui_executable(controller
qt_add_executable(controller
controller.cpp controller.h controller.ui
main.cpp
${controller_SRCS} # special case
Expand Down
2 changes: 1 addition & 1 deletion examples/embedded/digiflip/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Widgets)

add_qt_gui_executable(digiflip
qt_add_executable(digiflip
digiflip.cpp
)
target_link_libraries(digiflip PUBLIC
Expand Down
2 changes: 1 addition & 1 deletion examples/embedded/flickable/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Widgets)

add_qt_gui_executable(flickable
qt_add_executable(flickable
flickable.cpp flickable.h
main.cpp
)
Expand Down
2 changes: 1 addition & 1 deletion examples/embedded/flightinfo/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Network)
find_package(Qt6 COMPONENTS Widgets)

add_qt_gui_executable(flightinfo
qt_add_executable(flightinfo
flightinfo.cpp
form.ui
)
Expand Down
2 changes: 1 addition & 1 deletion examples/embedded/lightmaps/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Network)
find_package(Qt6 COMPONENTS Widgets)

add_qt_gui_executable(lightmaps
qt_add_executable(lightmaps
lightmaps.cpp lightmaps.h
main.cpp
mapzoom.cpp mapzoom.h
Expand Down
2 changes: 1 addition & 1 deletion examples/embedded/raycasting/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Widgets)

add_qt_gui_executable(raycasting
qt_add_executable(raycasting
raycasting.cpp
)
target_link_libraries(raycasting PUBLIC
Expand Down
2 changes: 1 addition & 1 deletion examples/embedded/styleexample/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Widgets)

add_qt_gui_executable(styleexample
qt_add_executable(styleexample
main.cpp
stylewidget.cpp stylewidget.h stylewidget.ui
)
Expand Down
2 changes: 1 addition & 1 deletion examples/gui/analogclock/.prev_CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/gui/analogclock")
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)

add_qt_gui_executable(analogclock
qt_add_executable(analogclock
../rasterwindow/rasterwindow.cpp ../rasterwindow/rasterwindow.h
main.cpp
)
Expand Down
2 changes: 1 addition & 1 deletion examples/gui/analogclock/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Widgets) # special case: add

add_qt_gui_executable(gui_analogclock # special case: renamed target
qt_add_executable(gui_analogclock # special case: renamed target
../rasterwindow/rasterwindow.cpp ../rasterwindow/rasterwindow.h
main.cpp
)
Expand Down
2 changes: 1 addition & 1 deletion examples/gui/rasterwindow/.prev_CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/gui/rasterwindow")
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)

add_qt_gui_executable(rasterwindow
qt_add_executable(rasterwindow
main.cpp
rasterwindow.cpp rasterwindow.h
)
Expand Down
2 changes: 1 addition & 1 deletion examples/gui/rasterwindow/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/gui/rasterwindow")
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)

add_qt_gui_executable(rasterwindow
qt_add_executable(rasterwindow
main.cpp
rasterwindow.cpp rasterwindow.h
)
Expand Down
2 changes: 1 addition & 1 deletion examples/network/blockingfortuneclient/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Network)
find_package(Qt6 COMPONENTS Widgets)

add_qt_gui_executable(blockingfortuneclient
qt_add_executable(blockingfortuneclient
blockingclient.cpp blockingclient.h
fortunethread.cpp fortunethread.h
main.cpp
Expand Down
2 changes: 1 addition & 1 deletion examples/network/broadcastreceiver/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Network)
find_package(Qt6 COMPONENTS Widgets)

add_qt_gui_executable(broadcastreceiver
qt_add_executable(broadcastreceiver
main.cpp
receiver.cpp receiver.h
)
Expand Down
2 changes: 1 addition & 1 deletion examples/network/broadcastsender/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Network)
find_package(Qt6 COMPONENTS Widgets)

add_qt_gui_executable(broadcastsender
qt_add_executable(broadcastsender
main.cpp
sender.cpp sender.h
)
Expand Down
2 changes: 1 addition & 1 deletion examples/network/dnslookup/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/network/dnslookup")
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Network)

add_executable(dnslookup
qt_add_executable(dnslookup
dnslookup.cpp dnslookup.h
)
target_link_libraries(dnslookup PUBLIC
Expand Down
2 changes: 1 addition & 1 deletion examples/network/download/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/network/download")
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Network)

add_executable(download
qt_add_executable(download
main.cpp
)
target_link_libraries(download PUBLIC
Expand Down
2 changes: 1 addition & 1 deletion examples/network/downloadmanager/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/network/downloadmanager")
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Network)

add_executable(downloadmanager
qt_add_executable(downloadmanager
downloadmanager.cpp downloadmanager.h
main.cpp
textprogressbar.cpp textprogressbar.h
Expand Down
2 changes: 1 addition & 1 deletion examples/network/fortuneclient/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Network)
find_package(Qt6 COMPONENTS Widgets)

add_qt_gui_executable(fortuneclient
qt_add_executable(fortuneclient
client.cpp client.h
main.cpp
)
Expand Down
2 changes: 1 addition & 1 deletion examples/network/fortuneserver/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Network)
find_package(Qt6 COMPONENTS Widgets)

add_qt_gui_executable(fortuneserver
qt_add_executable(fortuneserver
main.cpp
server.cpp server.h
)
Expand Down
2 changes: 1 addition & 1 deletion examples/network/googlesuggest/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Network)
find_package(Qt6 COMPONENTS Widgets)

add_qt_gui_executable(googlesuggest
qt_add_executable(googlesuggest
googlesuggest.cpp googlesuggest.h
main.cpp
searchbox.cpp searchbox.h
Expand Down
Loading

0 comments on commit 2ffbac7

Please sign in to comment.