CMake: Prefer unversioned commands

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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