AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Prefer unversioned commands

Browse Source 
Pick-to: 6.3
Change-Id: Ib32700ab82cf6b271c49e25d12fbad8c9c6bc1d1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Kai Köhne 2021-12-08 15:59:33 +01:00 committed by Kai Koehne
parent 85c5ae2ab8
commit 28a9d116bb
74 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/corelib/bindableproperties/bindablesubscription/CMakeLists.txt
View File

@ -35,7 +35,7 @@ set(countries_resource_files
"../shared/norway.png"
)
qt6_add_resources(bindablesubscription "countries"
qt_add_resources(bindablesubscription "countries"
PREFIX
"/"
BASE

2
examples/corelib/bindableproperties/subscription/CMakeLists.txt
View File

@ -35,7 +35,7 @@ set(countries_resource_files
"../shared/norway.png"
)
qt6_add_resources(subscription "countries"
qt_add_resources(subscription "countries"
PREFIX
"/"
BASE

2
examples/corelib/platform/androidnotifier/CMakeLists.txt
View File

@ -37,7 +37,7 @@ if(ANDROID)
"images/sad.png"
)
qt6_add_resources(androidnotifier "main"
qt_add_resources(androidnotifier "main"
PREFIX
"/"
FILES

4
examples/dbus/chat/CMakeLists.txt
View File

@ -19,11 +19,11 @@ find_package(Qt6 REQUIRED COMPONENTS Core DBus Gui Widgets)
# special case begin
set(chat_SRCS)
qt6_add_dbus_interface(chat_SRCS
qt_add_dbus_interface(chat_SRCS
org.example.chat.xml
chat_interface
)
qt6_add_dbus_adaptor(chat_SRCS
qt_add_dbus_adaptor(chat_SRCS
org.example.chat.xml
qobject.h
QObject

2
examples/dbus/remotecontrolledcar/car/CMakeLists.txt
View File

@ -19,7 +19,7 @@ find_package(Qt6 REQUIRED COMPONENTS Core DBus Gui Widgets)
# special case begin
set(car_SRCS)
qt6_add_dbus_adaptor(car_SRCS
qt_add_dbus_adaptor(car_SRCS
car.xml
qobject.h
"" # empty parent_class value on purpose to not pass -l flag

2
examples/dbus/remotecontrolledcar/controller/CMakeLists.txt
View File

@ -19,7 +19,7 @@ find_package(Qt6 REQUIRED COMPONENTS Core DBus Gui Widgets)
# special case begin
set(controller_SRCS)
qt6_add_dbus_interface(controller_SRCS
qt_add_dbus_interface(controller_SRCS
car.xml
car_interface
)

2
examples/embedded/flightinfo/CMakeLists.txt
View File

@ -38,7 +38,7 @@ set(flightinfo_resource_files
"aircraft.png"
)
qt6_add_resources(flightinfo "flightinfo"
qt_add_resources(flightinfo "flightinfo"
PREFIX
"/"
FILES

2
examples/embedded/raycasting/CMakeLists.txt
View File

@ -36,7 +36,7 @@ set(raycasting_resource_files
"textures.png"
)
qt6_add_resources(raycasting "raycasting"
qt_add_resources(raycasting "raycasting"
PREFIX
"/"
FILES

2
examples/embedded/styleexample/CMakeLists.txt
View File

@ -44,7 +44,7 @@ set(styleexample_resource_files
"files/transparent.qss"
)
qt6_add_resources(styleexample "styleexample"
qt_add_resources(styleexample "styleexample"
PREFIX
"/"
FILES

2
examples/network/securesocketclient/CMakeLists.txt
View File

@ -40,7 +40,7 @@ set(securesocketclient_resource_files
"encrypted.png"
)
qt6_add_resources(securesocketclient "securesocketclient"
qt_add_resources(securesocketclient "securesocketclient"
PREFIX
"/"
FILES

2
examples/network/torrent/CMakeLists.txt
View File

@ -56,7 +56,7 @@ set(icons_resource_files
"icons/player_stop.png"
)
qt6_add_resources(torrent "icons"
qt_add_resources(torrent "icons"
PREFIX
"/"
FILES

2
examples/opengl/computegles31/CMakeLists.txt
View File

@ -37,7 +37,7 @@ set(computegles31_resource_files
"Qt-logo-medium.png"
)
qt6_add_resources(computegles31 "computegles31"
qt_add_resources(computegles31 "computegles31"
PREFIX
"/"
FILES

2
examples/opengl/hellogles3/CMakeLists.txt
View File

@ -38,7 +38,7 @@ set(hellogles3_resource_files
"qtlogo.png"
)
qt6_add_resources(hellogles3 "hellogles3"
qt_add_resources(hellogles3 "hellogles3"
PREFIX
"/"
FILES

2
examples/opengl/qopenglwindow/CMakeLists.txt
View File

@ -41,7 +41,7 @@ set(shaders_resource_files
"background.frag"
)
qt6_add_resources(qopenglwindow "shaders"
qt_add_resources(qopenglwindow "shaders"
PREFIX
"/"
FILES

2
examples/sql/books/CMakeLists.txt
View File

@ -44,7 +44,7 @@ set(books_resource_files
"images/star.png"
)
qt6_add_resources(books "books"
qt_add_resources(books "books"
PREFIX
"/"
FILES

2
examples/sql/drilldown/CMakeLists.txt
View File

@ -44,7 +44,7 @@ set(drilldown_resource_files
"images/qt-quick.png"
)
qt6_add_resources(drilldown "drilldown"
qt_add_resources(drilldown "drilldown"
PREFIX
"/"
FILES

2
examples/sql/masterdetail/CMakeLists.txt
View File

@ -42,7 +42,7 @@ set(masterdetail_resource_files
"images/image.png"
)
qt6_add_resources(masterdetail "masterdetail"
qt_add_resources(masterdetail "masterdetail"
PREFIX
"/"
FILES

2
examples/vulkan/hellovulkantexture/CMakeLists.txt
View File

@ -38,7 +38,7 @@ set(hellovulkantexture_resource_files
"texture_vert.spv"
)
qt6_add_resources(hellovulkantexture "hellovulkantexture"
qt_add_resources(hellovulkantexture "hellovulkantexture"
PREFIX
"/"
FILES

2
examples/vulkan/hellovulkantriangle/CMakeLists.txt
View File

@ -43,7 +43,7 @@ set(hellovulkantriangle_resource_files
"../shared/color_vert.spv"
)
qt6_add_resources(hellovulkantriangle "hellovulkantriangle"
qt_add_resources(hellovulkantriangle "hellovulkantriangle"
PREFIX
"/"
FILES

2
examples/vulkan/hellovulkanwidget/CMakeLists.txt
View File

@ -45,7 +45,7 @@ set(hellovulkanwidget_resource_files
"../shared/color_vert.spv"
)
qt6_add_resources(hellovulkanwidget "hellovulkanwidget"
qt_add_resources(hellovulkanwidget "hellovulkanwidget"
PREFIX
"/"
FILES

2
examples/widgets/animation/easing/CMakeLists.txt
View File

@ -39,7 +39,7 @@ set(easing_resource_files
"images/qt-logo.png"
)
qt6_add_resources(easing "easing"
qt_add_resources(easing "easing"
PREFIX
"/"
FILES

2
examples/widgets/desktop/systray/CMakeLists.txt
View File

@ -39,7 +39,7 @@ set(systray_resource_files
"images/trash.png"
)
qt6_add_resources(systray "systray"
qt_add_resources(systray "systray"
PREFIX
"/"
FILES

2
examples/widgets/dialogs/classwizard/CMakeLists.txt
View File

@ -43,7 +43,7 @@ set(classwizard_resource_files
"images/watermark2.png"
)
qt6_add_resources(classwizard "classwizard"
qt_add_resources(classwizard "classwizard"
PREFIX
"/"
FILES

2
examples/widgets/dialogs/licensewizard/CMakeLists.txt
View File

@ -39,7 +39,7 @@ set(licensewizard_resource_files
"images/watermark.png"
)
qt6_add_resources(licensewizard "licensewizard"
qt_add_resources(licensewizard "licensewizard"
PREFIX
"/"
FILES

2
examples/widgets/draganddrop/draggableicons/CMakeLists.txt
View File

@ -39,7 +39,7 @@ set(draggableicons_resource_files
"images/house.png"
)
qt6_add_resources(draggableicons "draggableicons"
qt_add_resources(draggableicons "draggableicons"
PREFIX
"/"
FILES

2
examples/widgets/draganddrop/draggabletext/CMakeLists.txt
View File

@ -37,7 +37,7 @@ set(draggabletext_resource_files
"words.txt"
)
qt6_add_resources(draggabletext "draggabletext"
qt_add_resources(draggabletext "draggabletext"
PREFIX
"/dictionary"
FILES

2
examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt
View File

@ -38,7 +38,7 @@ set(fridgemagnets_resource_files
"words.txt"
)
qt6_add_resources(fridgemagnets "fridgemagnets"
qt_add_resources(fridgemagnets "fridgemagnets"
PREFIX
"/dictionary"
FILES

2
examples/widgets/draganddrop/puzzle/CMakeLists.txt
View File

@ -39,7 +39,7 @@ set(puzzle_resource_files
"example.jpg"
)
qt6_add_resources(draganddrop_puzzle "puzzle" # special case
qt_add_resources(draganddrop_puzzle "puzzle" # special case
PREFIX
"/images"
FILES

2
examples/widgets/effects/blurpicker/CMakeLists.txt
View File

@ -46,7 +46,7 @@ set(blurpicker_resource_files
"images/system-users.png"
)
qt6_add_resources(blurpicker "blurpicker"
qt_add_resources(blurpicker "blurpicker"
PREFIX
"/"
FILES

2
examples/widgets/effects/fademessage/CMakeLists.txt
View File

@ -37,7 +37,7 @@ set(fademessage_resource_files
"background.jpg"
)
qt6_add_resources(fademessage "fademessage"
qt_add_resources(fademessage "fademessage"
PREFIX
"/"
FILES

2
examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt
View File

@ -38,7 +38,7 @@ set(basicgraphicslayouts_resource_files
"images/block.png"
)
qt6_add_resources(basicgraphicslayouts "basicgraphicslayouts"
qt_add_resources(basicgraphicslayouts "basicgraphicslayouts"
PREFIX
"/"
FILES

2
examples/widgets/graphicsview/chip/CMakeLists.txt
View File

@ -47,7 +47,7 @@ set(images_resource_files
"zoomout.png"
)
qt6_add_resources(chip "images"
qt_add_resources(chip "images"
PREFIX
"/"
FILES

2
examples/widgets/graphicsview/collidingmice/CMakeLists.txt
View File

@ -37,7 +37,7 @@ set(mice_resource_files
"images/cheese.jpg"
)
qt6_add_resources(collidingmice "mice"
qt_add_resources(collidingmice "mice"
PREFIX
"/"
FILES

2
examples/widgets/graphicsview/diagramscene/CMakeLists.txt
View File

@ -55,7 +55,7 @@ set(diagramscene_resource_files
"images/underline.png"
)
qt6_add_resources(diagramscene "diagramscene"
qt_add_resources(diagramscene "diagramscene"
PREFIX
"/"
FILES

2
examples/widgets/graphicsview/dragdroprobot/CMakeLists.txt
View File

@ -38,7 +38,7 @@ set(robot_resource_files
"images/head.png"
)
qt6_add_resources(dragdroprobot "robot"
qt_add_resources(dragdroprobot "robot"
PREFIX
"/"
FILES

2
examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt
View File

@ -38,7 +38,7 @@ set(embeddeddialogs_resource_files
"No-Ones-Laughing-3.jpg"
)
qt6_add_resources(embeddeddialogs "embeddeddialogs"
qt_add_resources(embeddeddialogs "embeddeddialogs"
PREFIX
"/"
FILES

2
examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt
View File

@ -41,7 +41,7 @@ set(weatheranchorlayout_resource_files
"images/weather-few-clouds.png"
)
qt6_add_resources(weatheranchorlayout "weatheranchorlayout"
qt_add_resources(weatheranchorlayout "weatheranchorlayout"
PREFIX
"/"
FILES

2
examples/widgets/itemviews/chart/CMakeLists.txt
View File

@ -38,7 +38,7 @@ set(chart_resource_files
"qtdata.cht"
)
qt6_add_resources(chart "chart"
qt_add_resources(chart "chart"
PREFIX
"/Charts"
FILES

2
examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt
View File

@ -39,7 +39,7 @@ set(customsortfiltermodel_resource_files
"images/find.png"
)
qt6_add_resources(customsortfiltermodel "customsortfiltermodel"
qt_add_resources(customsortfiltermodel "customsortfiltermodel"
PREFIX
"/"
FILES

2
examples/widgets/itemviews/editabletreemodel/CMakeLists.txt
View File

@ -39,7 +39,7 @@ set(editabletreemodel_resource_files
"default.txt"
)
qt6_add_resources(editabletreemodel "editabletreemodel"
qt_add_resources(editabletreemodel "editabletreemodel"
PREFIX
"/"
FILES

2
examples/widgets/itemviews/frozencolumn/CMakeLists.txt
View File

@ -37,7 +37,7 @@ set(grades_resource_files
"grades.txt"
)
qt6_add_resources(frozencolumn "grades"
qt_add_resources(frozencolumn "grades"
PREFIX
"/"
FILES

2
examples/widgets/itemviews/interview/CMakeLists.txt
View File

@ -39,7 +39,7 @@ set(interview_resource_files
"images/services.png"
)
qt6_add_resources(interview "interview"
qt_add_resources(interview "interview"
PREFIX
"/"
FILES

2
examples/widgets/itemviews/pixelator/CMakeLists.txt
View File

@ -42,7 +42,7 @@ set(images_resource_files
"images/qt.png"
)
qt6_add_resources(pixelator "images"
qt_add_resources(pixelator "images"
PREFIX
"/"
FILES

2
examples/widgets/itemviews/puzzle/CMakeLists.txt
View File

@ -39,7 +39,7 @@ set(puzzle_resource_files
"example.jpg"
)
qt6_add_resources(itemviews_puzzle "puzzle"
qt_add_resources(itemviews_puzzle "puzzle"
PREFIX
"/images"
FILES

2
examples/widgets/itemviews/simpletreemodel/CMakeLists.txt
View File

@ -38,7 +38,7 @@ set(simpletreemodel_resource_files
"default.txt"
)
qt6_add_resources(simpletreemodel "simpletreemodel"
qt_add_resources(simpletreemodel "simpletreemodel"
PREFIX
"/"
FILES

2
examples/widgets/itemviews/spreadsheet/CMakeLists.txt
View File

@ -48,7 +48,7 @@ set(spreadsheet_resource_files
"images/interview.png"
)
qt6_add_resources(spreadsheet "spreadsheet"
qt_add_resources(spreadsheet "spreadsheet"
PREFIX
"/"
FILES

2
examples/widgets/mainwindows/application/CMakeLists.txt
View File

@ -42,7 +42,7 @@ set(application_resource_files
"images/save.png"
)
qt6_add_resources(application "application"
qt_add_resources(application "application"
PREFIX
"/"
FILES

2
examples/widgets/mainwindows/dockwidgets/CMakeLists.txt
View File

@ -48,7 +48,7 @@ set(dockwidgets_resource_files
"images/undo.png"
)
qt6_add_resources(dockwidgets "dockwidgets"
qt_add_resources(dockwidgets "dockwidgets"
PREFIX
"/"
FILES

2
examples/widgets/mainwindows/mainwindow/CMakeLists.txt
View File

@ -42,7 +42,7 @@ set(mainwindow_resource_files
"titlebarRight.png"
)
qt6_add_resources(mainwindow "mainwindow"
qt_add_resources(mainwindow "mainwindow"
PREFIX
"/res"
FILES

2
examples/widgets/mainwindows/mdi/CMakeLists.txt
View File

@ -43,7 +43,7 @@ set(mdi_resource_files
"images/save.png"
)
qt6_add_resources(mdi "mdi"
qt_add_resources(mdi "mdi"
PREFIX
"/"
FILES

2
examples/widgets/mainwindows/sdi/CMakeLists.txt
View File

@ -42,7 +42,7 @@ set(sdi_resource_files
"images/save.png"
)
qt6_add_resources(sdi "sdi"
qt_add_resources(sdi "sdi"
PREFIX
"/"
FILES

4
examples/widgets/painting/affine/CMakeLists.txt
View File

@ -88,7 +88,7 @@ set(shared_resource_files
"../shared/images/title_stretch.png"
)
qt6_add_resources(affine "shared"
qt_add_resources(affine "shared"
PREFIX
"/res"
BASE
@ -102,7 +102,7 @@ set(affine_resource_files
"xform.html"
)
qt6_add_resources(affine "affine"
qt_add_resources(affine "affine"
PREFIX
"/res/affine"
FILES

2
examples/widgets/painting/basicdrawing/CMakeLists.txt
View File

@ -39,7 +39,7 @@ set(basicdrawing_resource_files
"images/qt-logo.png"
)
qt6_add_resources(basicdrawing "basicdrawing"
qt_add_resources(basicdrawing "basicdrawing"
PREFIX
"/"
FILES

4
examples/widgets/painting/composition/CMakeLists.txt
View File

@ -88,7 +88,7 @@ set(shared_resource_files
"../shared/images/title_stretch.png"
)
qt6_add_resources(composition "shared"
qt_add_resources(composition "shared"
PREFIX
"/res"
BASE
@ -103,7 +103,7 @@ set(composition_resource_files
"flower_alpha.jpg"
)
qt6_add_resources(composition "composition"
qt_add_resources(composition "composition"
PREFIX
"/res/composition"
FILES

4
examples/widgets/painting/deform/CMakeLists.txt
View File

@ -88,7 +88,7 @@ set(shared_resource_files
"../shared/images/title_stretch.png"
)
qt6_add_resources(deform "shared"
qt_add_resources(deform "shared"
PREFIX
"/res"
BASE
@ -101,7 +101,7 @@ set(deform_resource_files
"pathdeform.html"
)
qt6_add_resources(deform "deform"
qt_add_resources(deform "deform"
PREFIX
"/res/deform"
FILES

4
examples/widgets/painting/gradients/CMakeLists.txt
View File

@ -88,7 +88,7 @@ set(shared_resource_files
"../shared/images/title_stretch.png"
)
qt6_add_resources(gradients "shared"
qt_add_resources(gradients "shared"
PREFIX
"/res"
BASE
@ -101,7 +101,7 @@ set(gradients_resource_files
"gradients.html"
)
qt6_add_resources(gradients "gradients"
qt_add_resources(gradients "gradients"
PREFIX
"/res/gradients"
FILES

2
examples/widgets/painting/imagecomposition/CMakeLists.txt
View File

@ -38,7 +38,7 @@ set(imagecomposition_resource_files
"images/checker.png"
)
qt6_add_resources(imagecomposition "imagecomposition"
qt_add_resources(imagecomposition "imagecomposition"
PREFIX
"/"
FILES

4
examples/widgets/painting/pathstroke/CMakeLists.txt
View File

@ -88,7 +88,7 @@ set(shared_resource_files
"../shared/images/title_stretch.png"
)
qt6_add_resources(pathstroke "shared"
qt_add_resources(pathstroke "shared"
PREFIX
"/res"
BASE
@ -101,7 +101,7 @@ set(pathstroke_resource_files
"pathstroke.html"
)
qt6_add_resources(pathstroke "pathstroke"
qt_add_resources(pathstroke "pathstroke"
PREFIX
"/res/pathstroke"
FILES

2
examples/widgets/richtext/textedit/CMakeLists.txt
View File

@ -94,7 +94,7 @@ set(textedit_resource_files
"images/win/zoomout.png"
)
qt6_add_resources(textedit "textedit"
qt_add_resources(textedit "textedit"
PREFIX
"/"
FILES

2
examples/widgets/tools/completer/CMakeLists.txt
View File

@ -39,7 +39,7 @@ set(completer_resource_files
"resources/wordlist.txt"
)
qt6_add_resources(completer "completer"
qt_add_resources(completer "completer"
PREFIX
"/"
FILES

2
examples/widgets/tools/customcompleter/CMakeLists.txt
View File

@ -38,7 +38,7 @@ set(customcompleter_resource_files
"resources/wordlist.txt"
)
qt6_add_resources(customcompleter "customcompleter"
qt_add_resources(customcompleter "customcompleter"
PREFIX
"/"
FILES

2
examples/widgets/tools/i18n/CMakeLists.txt
View File

@ -51,7 +51,7 @@ set(i18n_resource_files
"translations/i18n_zh.qm"
)
qt6_add_resources(i18n "i18n"
qt_add_resources(i18n "i18n"
PREFIX
"/"
FILES

2
examples/widgets/tools/regularexpression/CMakeLists.txt
View File

@ -37,7 +37,7 @@ set(regularexpression_resource_files
"images/copy.png"
)
qt6_add_resources(regularexpression "regularexpression"
qt_add_resources(regularexpression "regularexpression"
PREFIX
"/"
FILES

2
examples/widgets/tools/treemodelcompleter/CMakeLists.txt
View File

@ -38,7 +38,7 @@ set(treemodelcompleter_resource_files
"resources/treemodel.txt"
)
qt6_add_resources(treemodelcompleter "treemodelcompleter"
qt_add_resources(treemodelcompleter "treemodelcompleter"
PREFIX
"/"
FILES

2
examples/widgets/tools/undo/CMakeLists.txt
View File

@ -54,7 +54,7 @@ set(undo_resource_files
"icons/undo.png"
)
qt6_add_resources(undo "undo"
qt_add_resources(undo "undo"
PREFIX
"/"
FILES

2
examples/widgets/tools/undoframework/CMakeLists.txt
View File

@ -40,7 +40,7 @@ set(undoframework_resource_files
"images/cross.png"
)
qt6_add_resources(undoframework "undoframework"
qt_add_resources(undoframework "undoframework"
PREFIX
"/"
FILES

2
examples/widgets/touch/pinchzoom/CMakeLists.txt
View File

@ -38,7 +38,7 @@ set(mice_resource_files
"images/cheese.jpg"
)
qt6_add_resources(pinchzoom "mice"
qt_add_resources(pinchzoom "mice"
PREFIX
"/"
FILES

2
examples/widgets/tutorials/notepad/CMakeLists.txt
View File

@ -57,7 +57,7 @@ set(notepad_resource_files
"images/underline.png"
)
qt6_add_resources(notepad "notepad"
qt_add_resources(notepad "notepad"
PREFIX
"/"
FILES

2
examples/widgets/widgets/styles/CMakeLists.txt
View File

@ -39,7 +39,7 @@ set(styles_resource_files
"images/woodbutton.png"
)
qt6_add_resources(styles "styles"
qt_add_resources(styles "styles"
PREFIX
"/"
FILES

2
examples/widgets/widgets/stylesheet/CMakeLists.txt
View File

@ -72,7 +72,7 @@ set(stylesheet_resource_files
"qss/pagefold.qss"
)
qt6_add_resources(stylesheet "stylesheet"
qt_add_resources(stylesheet "stylesheet"
PREFIX
"/"
FILES

2
examples/widgets/widgets/tablet/CMakeLists.txt
View File

@ -42,7 +42,7 @@ set(images_resource_files
"images/cursor-pencil.png"
)
qt6_add_resources(qttablet "images"
qt_add_resources(qttablet "images"
PREFIX
"/"
FILES

2
examples/widgets/widgets/tooltips/CMakeLists.txt
View File

@ -40,7 +40,7 @@ set(tooltips_resource_files
"images/triangle.png"
)
qt6_add_resources(tooltips "tooltips"
qt_add_resources(tooltips "tooltips"
PREFIX
"/"
FILES

2
examples/widgets/widgets/validators/CMakeLists.txt
View File

@ -41,7 +41,7 @@ set(validators_resource_files
"ledon.png"
)
qt6_add_resources(validators "validators"
qt_add_resources(validators "validators"
PREFIX
"/"
FILES

2
examples/xml/htmlinfo/CMakeLists.txt
View File

@ -38,7 +38,7 @@ set(resources_resource_files
"youtube_com.html"
)
qt6_add_resources(htmlinfo "resources"
qt_add_resources(htmlinfo "resources"
PREFIX
"/"
FILES