aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/imports/folderlistmodel/CMakeLists.txt2
-rw-r--r--src/imports/labsanimation/CMakeLists.txt2
-rw-r--r--src/imports/labsmodels/CMakeLists.txt2
-rw-r--r--src/imports/layouts/CMakeLists.txt2
-rw-r--r--src/imports/localstorage/CMakeLists.txt2
-rw-r--r--src/imports/models/CMakeLists.txt2
-rw-r--r--src/imports/particles/CMakeLists.txt2
-rw-r--r--src/imports/qtqml/.prev_CMakeLists.txt2
-rw-r--r--src/imports/qtqml/CMakeLists.txt2
-rw-r--r--src/imports/qtquick2/CMakeLists.txt4
-rw-r--r--src/imports/settings/CMakeLists.txt2
-rw-r--r--src/imports/shapes/CMakeLists.txt2
-rw-r--r--src/imports/sharedimage/CMakeLists.txt2
-rw-r--r--src/imports/statemachine/CMakeLists.txt2
-rw-r--r--src/imports/testlib/.prev_CMakeLists.txt2
-rw-r--r--src/imports/testlib/CMakeLists.txt2
-rw-r--r--src/imports/wavefrontmesh/CMakeLists.txt2
-rw-r--r--src/imports/window/CMakeLists.txt2
-rw-r--r--src/imports/workerscript/CMakeLists.txt2
-rw-r--r--src/particles/CMakeLists.txt12
-rw-r--r--src/plugins/qmltooling/packetprotocol/CMakeLists.txt2
-rw-r--r--src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt2
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt2
-rw-r--r--src/plugins/qmltooling/qmldbg_local/CMakeLists.txt2
-rw-r--r--src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt2
-rw-r--r--src/plugins/qmltooling/qmldbg_native/CMakeLists.txt2
-rw-r--r--src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt2
-rw-r--r--src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt2
-rw-r--r--src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt2
-rw-r--r--src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt2
-rw-r--r--src/plugins/qmltooling/qmldbg_server/CMakeLists.txt2
-rw-r--r--src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt2
-rw-r--r--src/plugins/scenegraph/openvg/CMakeLists.txt4
-rw-r--r--src/qml/.prev_CMakeLists.txt76
-rw-r--r--src/qml/CMakeLists.txt76
-rw-r--r--src/qmldebug/CMakeLists.txt2
-rw-r--r--src/qmldevtools/.prev_CMakeLists.txt4
-rw-r--r--src/qmldevtools/CMakeLists.txt4
-rw-r--r--src/qmlmodels/CMakeLists.txt12
-rw-r--r--src/qmltest/.prev_CMakeLists.txt8
-rw-r--r--src/qmltest/CMakeLists.txt8
-rw-r--r--src/qmlworkerscript/.prev_CMakeLists.txt20
-rw-r--r--src/qmlworkerscript/CMakeLists.txt20
-rw-r--r--src/quick/CMakeLists.txt66
-rw-r--r--src/quickshapes/CMakeLists.txt6
-rw-r--r--src/quickwidgets/CMakeLists.txt2
-rw-r--r--tests/auto/particles/qquickage/CMakeLists.txt6
-rw-r--r--tests/auto/particles/qquickangleddirection/CMakeLists.txt6
-rw-r--r--tests/auto/particles/qquickcumulativedirection/CMakeLists.txt6
-rw-r--r--tests/auto/particles/qquickcustomaffector/CMakeLists.txt6
-rw-r--r--tests/auto/particles/qquickcustomparticle/CMakeLists.txt6
-rw-r--r--tests/auto/particles/qquickellipseextruder/CMakeLists.txt6
-rw-r--r--tests/auto/particles/qquickfriction/CMakeLists.txt6
-rw-r--r--tests/auto/particles/qquickgravity/CMakeLists.txt6
-rw-r--r--tests/auto/particles/qquickgroupgoal/CMakeLists.txt6
-rw-r--r--tests/auto/particles/qquickimageparticle/CMakeLists.txt6
-rw-r--r--tests/auto/particles/qquickitemparticle/CMakeLists.txt6
-rw-r--r--tests/auto/particles/qquicklineextruder/CMakeLists.txt6
-rw-r--r--tests/auto/particles/qquickmaskextruder/CMakeLists.txt6
-rw-r--r--tests/auto/particles/qquickparticlegroup/CMakeLists.txt6
-rw-r--r--tests/auto/particles/qquickparticlesystem/CMakeLists.txt6
-rw-r--r--tests/auto/particles/qquickpointattractor/CMakeLists.txt6
-rw-r--r--tests/auto/particles/qquickpointdirection/CMakeLists.txt6
-rw-r--r--tests/auto/particles/qquickrectangleextruder/CMakeLists.txt6
-rw-r--r--tests/auto/particles/qquickspritegoal/CMakeLists.txt6
-rw-r--r--tests/auto/particles/qquicktargetdirection/CMakeLists.txt6
-rw-r--r--tests/auto/particles/qquicktrailemitter/CMakeLists.txt6
-rw-r--r--tests/auto/particles/qquickturbulence/CMakeLists.txt6
-rw-r--r--tests/auto/particles/qquickwander/CMakeLists.txt6
-rw-r--r--tests/auto/qml/animation/qabstractanimationjob/CMakeLists.txt2
-rw-r--r--tests/auto/qml/animation/qanimationgroupjob/CMakeLists.txt2
-rw-r--r--tests/auto/qml/animation/qparallelanimationgroupjob/CMakeLists.txt2
-rw-r--r--tests/auto/qml/animation/qpauseanimationjob/CMakeLists.txt2
-rw-r--r--tests/auto/qml/animation/qsequentialanimationgroupjob/CMakeLists.txt2
-rw-r--r--tests/auto/qml/bindingdependencyapi/CMakeLists.txt6
-rw-r--r--tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt6
-rw-r--r--tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt6
-rw-r--r--tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt6
-rw-r--r--tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt6
-rw-r--r--tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/CMakeLists.txt2
-rw-r--r--tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt6
-rw-r--r--tests/auto/qml/debugger/qqmldebugjsserver/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/debugger/qqmldebugjsserver/CMakeLists.txt2
-rw-r--r--tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt6
-rw-r--r--tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess/CMakeLists.txt2
-rw-r--r--tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/CMakeLists.txt2
-rw-r--r--tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt6
-rw-r--r--tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt6
-rw-r--r--tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt6
-rw-r--r--tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt6
-rw-r--r--tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt6
-rw-r--r--tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt2
-rw-r--r--tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt6
-rw-r--r--tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt6
-rw-r--r--tests/auto/qml/debugger/qv4debugger/CMakeLists.txt2
-rw-r--r--tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt2
-rw-r--r--tests/auto/qml/parserstress/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qjsengine/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qjsonbinding/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qjsvalue/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qjsvalueiterator/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qmlcachegen/CMakeLists.txt16
-rw-r--r--tests/auto/qml/qmldiskcache/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/qml/qmldiskcache/CMakeLists.txt4
-rw-r--r--tests/auto/qml/qmllint/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qmlmin/CMakeLists.txt4
-rw-r--r--tests/auto/qml/qmlplugindump/data/dumper/Dummy/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/qmlplugindump/data/dumper/Dummy/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qmlplugindump/data/dumper/Versions/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/qmlplugindump/data/dumper/Versions/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlapplicationengine/testapp/CMakeLists.txt4
-rw-r--r--tests/auto/qml/qqmlbinding/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmlchangeset/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlcomponent/CMakeLists.txt8
-rw-r--r--tests/auto/qml/qqmlconnections/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmlconsole/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmlcontext/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmlcpputils/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmldirparser/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt10
-rw-r--r--tests/auto/qml/qqmlecmascript/CMakeLists.txt10
-rw-r--r--tests/auto/qml/qqmlengine/CMakeLists.txt10
-rw-r--r--tests/auto/qml/qqmlenginecleanup/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmlenginecleanup/CustomModuleImport/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/qml/qqmlenginecleanup/CustomModuleImport/CMakeLists.txt4
-rw-r--r--tests/auto/qml/qqmlerror/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmlexpression/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmlextensionplugin/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlfile/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlfileselector/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmlglobal/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlimport/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmlincubator/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmlinfo/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmlinstantiator/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmlitemmodels/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmllanguage/CMakeLists.txt8
-rw-r--r--tests/auto/qml/qqmllistcompositor/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmllistmodel/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmllistreference/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmllocale/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmlmetaobject/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmlmetatype/CMakeLists.txt10
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/nestedPlugin/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/nonstrictModule/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/nonstrictModule/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/plugin.2.1/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/plugin.2.1/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/plugin.2.2/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/plugin.2.2/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/plugin.2/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/plugin.2/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/plugin/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/plugin/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/pluginMixed/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/pluginMixed/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/preemptiveModule/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/preemptiveModule/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/protectedModule/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/protectedModule/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/strictModule.2/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/strictModule.2/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/strictModule/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/strictModule/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlnotifier/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmlobjectmodel/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlopenmetaobject/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlparser/CMakeLists.txt8
-rw-r--r--tests/auto/qml/qqmlpromise/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmlproperty/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmlpropertycache/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmlpropertymap/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmlqt/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmlsettings/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmlsqldatabase/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmlstatemachine/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmltablemodel/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmltimer/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt8
-rw-r--r--tests/auto/qml/qqmltranslation/CMakeLists.txt8
-rw-r--r--tests/auto/qml/qqmltypeloader/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmltypeloader/SlowImport/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmltypeloader/SlowImport/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmlvaluetypes/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt8
-rw-r--r--tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt8
-rw-r--r--tests/auto/qml/qquickworkerscript/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qrcqml/CMakeLists.txt10
-rw-r--r--tests/auto/qml/qtqmlmodules/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qv4assembler/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qv4identifiertable/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qv4mm/CMakeLists.txt6
-rw-r--r--tests/auto/qml/qv4regexp/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qwidgetsinqml/CMakeLists.txt2
-rw-r--r--tests/auto/qml/v4misc/CMakeLists.txt2
-rw-r--r--tests/auto/qmldevtools/compile/CMakeLists.txt6
-rw-r--r--tests/auto/qmltest-blacklist/shortcut/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/animatedimage/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/animations/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/borderimage/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/buttonclick/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/createbenchmark/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/events/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/fontloader/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/gradient/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/image/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/itemgrabber/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/layout/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/listmodel/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/listview/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/objectmodel/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/pathview/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/pixel/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/positioners/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/qqmlbinding/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/qtbug46798/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/rectangle/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/selftests/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/shadersource/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/stability/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/statemachine/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/text/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/textedit/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/textinput/CMakeLists.txt2
-rw-r--r--tests/auto/qmltest/window/CMakeLists.txt2
-rw-r--r--tests/auto/quick/drawingmodes/CMakeLists.txt6
-rw-r--r--tests/auto/quick/examples/CMakeLists.txt2
-rw-r--r--tests/auto/quick/geometry/CMakeLists.txt2
-rw-r--r--tests/auto/quick/nodes/CMakeLists.txt2
-rw-r--r--tests/auto/quick/nokeywords/CMakeLists.txt2
-rw-r--r--tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt6
-rw-r--r--tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt6
-rw-r--r--tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt6
-rw-r--r--tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt6
-rw-r--r--tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt6
-rw-r--r--tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt6
-rw-r--r--tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt6
-rw-r--r--tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt6
-rw-r--r--tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt6
-rw-r--r--tests/auto/quick/propertyrequirements/CMakeLists.txt2
-rw-r--r--tests/auto/quick/qquickaccessible/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickanchors/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickanimatedimage/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickanimatedsprite/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickanimationcontroller/CMakeLists.txt2
-rw-r--r--tests/auto/quick/qquickanimations/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickanimators/CMakeLists.txt2
-rw-r--r--tests/auto/quick/qquickapplication/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickbehaviors/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickborderimage/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickboundaryrule/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickcanvasitem/CMakeLists.txt4
-rw-r--r--tests/auto/quick/qquickdesignersupport/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickdrag/CMakeLists.txt2
-rw-r--r--tests/auto/quick/qquickdroparea/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickflickable/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickflipable/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickfocusscope/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickfontloader/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickfontloader_static/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickfontmetrics/CMakeLists.txt2
-rw-r--r--tests/auto/quick/qquickframebufferobject/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickgridview/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickimage/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickimageprovider/CMakeLists.txt2
-rw-r--r--tests/auto/quick/qquickitem/CMakeLists.txt8
-rw-r--r--tests/auto/quick/qquickitem2/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickitemlayer/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquicklayouts/CMakeLists.txt2
-rw-r--r--tests/auto/quick/qquicklistview/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickloader/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickmousearea/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickopenglinfo/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickpainteditem/CMakeLists.txt2
-rw-r--r--tests/auto/quick/qquickpath/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickpathview/CMakeLists.txt8
-rw-r--r--tests/auto/quick/qquickpincharea/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickpixmapcache/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickpositioners/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickrectangle/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickrepeater/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickscreen/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickshadereffect/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickshape/CMakeLists.txt8
-rw-r--r--tests/auto/quick/qquickshortcut/CMakeLists.txt8
-rw-r--r--tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickspringanimation/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickspritesequence/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickstates/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickstyledtext/CMakeLists.txt2
-rw-r--r--tests/auto/quick/qquicksystempalette/CMakeLists.txt4
-rw-r--r--tests/auto/quick/qquicktableview/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquicktext/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquicktextdocument/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquicktextedit/CMakeLists.txt8
-rw-r--r--tests/auto/quick/qquicktextinput/CMakeLists.txt8
-rw-r--r--tests/auto/quick/qquicktextmetrics/CMakeLists.txt2
-rw-r--r--tests/auto/quick/qquicktimeline/CMakeLists.txt2
-rw-r--r--tests/auto/quick/qquickview/CMakeLists.txt6
-rw-r--r--tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt8
-rw-r--r--tests/auto/quick/qquickwindow/CMakeLists.txt6
-rw-r--r--tests/auto/quick/rendernode/CMakeLists.txt6
-rw-r--r--tests/auto/quick/scenegraph/CMakeLists.txt6
-rw-r--r--tests/auto/quick/sharedimage/CMakeLists.txt2
-rw-r--r--tests/auto/quick/touchmouse/CMakeLists.txt6
-rw-r--r--tests/auto/quicktest/polish-qml/CMakeLists.txt6
-rw-r--r--tests/auto/quicktest/polish/CMakeLists.txt6
-rw-r--r--tests/auto/quicktest/quicktestmainwithsetup/CMakeLists.txt6
-rw-r--r--tests/auto/quicktest/signalspy/CMakeLists.txt6
-rw-r--r--tests/auto/quicktest/testfiltering/quicktestmain/CMakeLists.txt2
-rw-r--r--tests/auto/quicktest/testfiltering/test/CMakeLists.txt2
-rw-r--r--tests/auto/quickwidgets/qquickwidget/CMakeLists.txt6
-rw-r--r--tests/auto/toolsupport/CMakeLists.txt2
-rw-r--r--tests/benchmarks/particles/affectors/CMakeLists.txt2
-rw-r--r--tests/benchmarks/particles/emission/CMakeLists.txt2
-rw-r--r--tests/benchmarks/qml/animation/CMakeLists.txt2
-rw-r--r--tests/benchmarks/qml/binding/CMakeLists.txt2
-rw-r--r--tests/benchmarks/qml/compilation/CMakeLists.txt2
-rw-r--r--tests/benchmarks/qml/creation/CMakeLists.txt2
-rw-r--r--tests/benchmarks/qml/holistic/CMakeLists.txt2
-rw-r--r--tests/benchmarks/qml/javascript/CMakeLists.txt2
-rw-r--r--tests/benchmarks/qml/js/qjsengine/CMakeLists.txt2
-rw-r--r--tests/benchmarks/qml/js/qjsvalue/CMakeLists.txt2
-rw-r--r--tests/benchmarks/qml/js/qjsvalueiterator/CMakeLists.txt2
-rw-r--r--tests/benchmarks/qml/librarymetrics_performance/CMakeLists.txt4
-rw-r--r--tests/benchmarks/qml/painting/CMakeLists.txt2
-rw-r--r--tests/benchmarks/qml/qqmlchangeset/CMakeLists.txt2
-rw-r--r--tests/benchmarks/qml/qqmlcomponent/.prev_CMakeLists.txt2
-rw-r--r--tests/benchmarks/qml/qqmlcomponent/CMakeLists.txt2
-rw-r--r--tests/benchmarks/qml/qqmlmetaproperty/CMakeLists.txt2
-rw-r--r--tests/benchmarks/qml/qquickwindow/CMakeLists.txt2
-rw-r--r--tests/benchmarks/qml/script/CMakeLists.txt2
-rw-r--r--tests/benchmarks/qml/typeimports/CMakeLists.txt2
-rw-r--r--tests/benchmarks/quick/events/CMakeLists.txt6
-rw-r--r--tests/libfuzzer/qml/jsapi/evaluate/CMakeLists.txt2
-rw-r--r--tests/manual/highdpi/CMakeLists.txt2
-rw-r--r--tests/manual/httpserver/CMakeLists.txt2
-rw-r--r--tests/manual/mousearea/CMakeLists.txt6
-rw-r--r--tests/manual/nodetypes/CMakeLists.txt4
-rw-r--r--tests/manual/nodetypes_ng/CMakeLists.txt4
-rw-r--r--tests/manual/pointer/CMakeLists.txt6
-rw-r--r--tests/manual/qmltypememory/CMakeLists.txt2
-rw-r--r--tests/manual/qmltypememory/TestPlugin/CMakeLists.txt2
-rw-r--r--tests/manual/quickwidgetviewer/CMakeLists.txt2
-rw-r--r--tests/manual/scalablepath/CMakeLists.txt4
-rw-r--r--tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt2
-rw-r--r--tests/manual/scenegraph_lancelot/scenegraph/CMakeLists.txt2
-rw-r--r--tests/manual/shapestest/CMakeLists.txt4
-rw-r--r--tests/manual/tableview/abstracttablemodel/CMakeLists.txt4
-rw-r--r--tests/manual/tableview/listmodel/CMakeLists.txt4
-rw-r--r--tests/manual/tableview/storagemodel/CMakeLists.txt4
-rw-r--r--tests/manual/tableview/tablemodel/form/CMakeLists.txt4
-rw-r--r--tests/manual/tableview/tablemodel/json/CMakeLists.txt4
-rw-r--r--tests/manual/text/CMakeLists.txt6
-rw-r--r--tests/manual/touch/CMakeLists.txt6
-rw-r--r--tests/manual/v4/auto/executableallocator/CMakeLists.txt2
-rw-r--r--tools/qml/.prev_CMakeLists.txt10
-rw-r--r--tools/qml/CMakeLists.txt10
-rw-r--r--tools/qmlcachegen/.prev_CMakeLists.txt2
-rw-r--r--tools/qmlcachegen/CMakeLists.txt2
-rw-r--r--tools/qmleasing/CMakeLists.txt4
-rw-r--r--tools/qmlimportscanner/.prev_CMakeLists.txt2
-rw-r--r--tools/qmlimportscanner/CMakeLists.txt2
-rw-r--r--tools/qmljs/.prev_CMakeLists.txt18
-rw-r--r--tools/qmljs/CMakeLists.txt18
-rw-r--r--tools/qmllint/.prev_CMakeLists.txt2
-rw-r--r--tools/qmllint/CMakeLists.txt2
-rw-r--r--tools/qmlmin/.prev_CMakeLists.txt2
-rw-r--r--tools/qmlmin/CMakeLists.txt2
-rw-r--r--tools/qmlplugindump/.prev_CMakeLists.txt6
-rw-r--r--tools/qmlplugindump/CMakeLists.txt6
-rw-r--r--tools/qmlpreview/.prev_CMakeLists.txt2
-rw-r--r--tools/qmlpreview/CMakeLists.txt2
-rw-r--r--tools/qmlprofiler/.prev_CMakeLists.txt2
-rw-r--r--tools/qmlprofiler/CMakeLists.txt2
-rw-r--r--tools/qmlscene/.prev_CMakeLists.txt6
-rw-r--r--tools/qmlscene/CMakeLists.txt6
-rw-r--r--tools/qmltestrunner/.prev_CMakeLists.txt2
-rw-r--r--tools/qmltestrunner/CMakeLists.txt2
-rw-r--r--tools/qmltime/CMakeLists.txt2
411 files changed, 969 insertions, 969 deletions
diff --git a/src/imports/folderlistmodel/CMakeLists.txt b/src/imports/folderlistmodel/CMakeLists.txt
index 7cd8d75653..e7c0ae5f91 100644
--- a/src/imports/folderlistmodel/CMakeLists.txt
+++ b/src/imports/folderlistmodel/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmlfolderlistmodelplugin Plugin:
#####################################################################
-add_qml_module(qmlfolderlistmodelplugin
+qt_add_qml_module(qmlfolderlistmodelplugin
URI "Qt.labs.folderlistmodel"
VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
CLASSNAME QmlFolderListModelPlugin
diff --git a/src/imports/labsanimation/CMakeLists.txt b/src/imports/labsanimation/CMakeLists.txt
index 6b54d02d72..8637496097 100644
--- a/src/imports/labsanimation/CMakeLists.txt
+++ b/src/imports/labsanimation/CMakeLists.txt
@@ -4,7 +4,7 @@
## labsanimationplugin Plugin:
#####################################################################
-add_qml_module(labsanimationplugin
+qt_add_qml_module(labsanimationplugin
URI "Qt.labs.animation"
VERSION "1.0"
CLASSNAME QtLabsAnimationPlugin
diff --git a/src/imports/labsmodels/CMakeLists.txt b/src/imports/labsmodels/CMakeLists.txt
index ce3e290a83..c198f02016 100644
--- a/src/imports/labsmodels/CMakeLists.txt
+++ b/src/imports/labsmodels/CMakeLists.txt
@@ -4,7 +4,7 @@
## labsmodelsplugin Plugin:
#####################################################################
-add_qml_module(labsmodelsplugin
+qt_add_qml_module(labsmodelsplugin
URI "Qt.labs.qmlmodels"
VERSION "1.0"
CLASSNAME QtQmlLabsModelsPlugin
diff --git a/src/imports/layouts/CMakeLists.txt b/src/imports/layouts/CMakeLists.txt
index 666aae5dc0..b7dabd13c9 100644
--- a/src/imports/layouts/CMakeLists.txt
+++ b/src/imports/layouts/CMakeLists.txt
@@ -4,7 +4,7 @@
## qquicklayoutsplugin Plugin:
#####################################################################
-add_qml_module(qquicklayoutsplugin
+qt_add_qml_module(qquicklayoutsplugin
URI "QtQuick.Layouts"
VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
DESIGNER_SUPPORTED
diff --git a/src/imports/localstorage/CMakeLists.txt b/src/imports/localstorage/CMakeLists.txt
index c785a4bd2e..efbf67e726 100644
--- a/src/imports/localstorage/CMakeLists.txt
+++ b/src/imports/localstorage/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmllocalstorageplugin Plugin:
#####################################################################
-add_qml_module(qmllocalstorageplugin
+qt_add_qml_module(qmllocalstorageplugin
URI "QtQuick.LocalStorage"
VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
CLASSNAME QQmlLocalStoragePlugin
diff --git a/src/imports/models/CMakeLists.txt b/src/imports/models/CMakeLists.txt
index 1bfb7a35d3..dc4639725d 100644
--- a/src/imports/models/CMakeLists.txt
+++ b/src/imports/models/CMakeLists.txt
@@ -4,7 +4,7 @@
## modelsplugin Plugin:
#####################################################################
-add_qml_module(modelsplugin
+qt_add_qml_module(modelsplugin
TARGET_PATH "QtQml/Models.2"
URI "QtQml.Models"
VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
diff --git a/src/imports/particles/CMakeLists.txt b/src/imports/particles/CMakeLists.txt
index f2f0ae8a84..5117471776 100644
--- a/src/imports/particles/CMakeLists.txt
+++ b/src/imports/particles/CMakeLists.txt
@@ -4,7 +4,7 @@
## particlesplugin Plugin:
#####################################################################
-add_qml_module(particlesplugin
+qt_add_qml_module(particlesplugin
TARGET_PATH "QtQuick/Particles.2"
URI "QtQuick.Particles"
VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
diff --git a/src/imports/qtqml/.prev_CMakeLists.txt b/src/imports/qtqml/.prev_CMakeLists.txt
index 281e83242f..827474f2fb 100644
--- a/src/imports/qtqml/.prev_CMakeLists.txt
+++ b/src/imports/qtqml/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## qmlplugin Plugin:
#####################################################################
-add_qml_module(qmlplugin
+qt_add_qml_module(qmlplugin
URI "QtQml"
VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
DESIGNER_SUPPORTED
diff --git a/src/imports/qtqml/CMakeLists.txt b/src/imports/qtqml/CMakeLists.txt
index a8ac5d8b8a..ac1a8e0834 100644
--- a/src/imports/qtqml/CMakeLists.txt
+++ b/src/imports/qtqml/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmlplugin Plugin:
#####################################################################
-add_qml_module(qmlplugin
+qt_add_qml_module(qmlplugin
URI "QtQml"
VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
DESIGNER_SUPPORTED
diff --git a/src/imports/qtquick2/CMakeLists.txt b/src/imports/qtquick2/CMakeLists.txt
index a8dabb3371..3287f5c2a6 100644
--- a/src/imports/qtquick2/CMakeLists.txt
+++ b/src/imports/qtquick2/CMakeLists.txt
@@ -4,7 +4,7 @@
## qtquick2plugin Plugin:
#####################################################################
-add_qml_module(qtquick2plugin
+qt_add_qml_module(qtquick2plugin
TARGET_PATH "QtQuick.2"
URI "QtQuick"
VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
@@ -35,7 +35,7 @@ add_qml_module(qtquick2plugin
## Scopes:
#####################################################################
-extend_target(qtquick2plugin CONDITION QT_FEATURE_qml_worker_script
+qt_extend_target(qtquick2plugin CONDITION QT_FEATURE_qml_worker_script
LIBRARIES
Qt::QmlWorkerScriptPrivate
PUBLIC_LIBRARIES
diff --git a/src/imports/settings/CMakeLists.txt b/src/imports/settings/CMakeLists.txt
index d3827443e0..1b092331ea 100644
--- a/src/imports/settings/CMakeLists.txt
+++ b/src/imports/settings/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmlsettingsplugin Plugin:
#####################################################################
-add_qml_module(qmlsettingsplugin
+qt_add_qml_module(qmlsettingsplugin
URI "Qt.labs.settings"
VERSION "1.1"
CLASSNAME QmlSettingsPlugin
diff --git a/src/imports/shapes/CMakeLists.txt b/src/imports/shapes/CMakeLists.txt
index 525b25e659..717e6af119 100644
--- a/src/imports/shapes/CMakeLists.txt
+++ b/src/imports/shapes/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmlshapesplugin Plugin:
#####################################################################
-add_qml_module(qmlshapesplugin
+qt_add_qml_module(qmlshapesplugin
URI "QtQuick.Shapes"
VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
CLASSNAME QmlShapesPlugin
diff --git a/src/imports/sharedimage/CMakeLists.txt b/src/imports/sharedimage/CMakeLists.txt
index dcf1b3f8e2..b6a676fe7b 100644
--- a/src/imports/sharedimage/CMakeLists.txt
+++ b/src/imports/sharedimage/CMakeLists.txt
@@ -4,7 +4,7 @@
## sharedimageplugin Plugin:
#####################################################################
-add_qml_module(sharedimageplugin
+qt_add_qml_module(sharedimageplugin
URI "Qt.labs.sharedimage"
VERSION "1.0"
CLASSNAME QtQuickSharedImagePlugin
diff --git a/src/imports/statemachine/CMakeLists.txt b/src/imports/statemachine/CMakeLists.txt
index a32278e755..a6e53d2027 100644
--- a/src/imports/statemachine/CMakeLists.txt
+++ b/src/imports/statemachine/CMakeLists.txt
@@ -4,7 +4,7 @@
## qtqmlstatemachine Plugin:
#####################################################################
-add_qml_module(qtqmlstatemachine
+qt_add_qml_module(qtqmlstatemachine
URI "QtQml.StateMachine"
VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
CLASSNAME QtQmlStateMachinePlugin
diff --git a/src/imports/testlib/.prev_CMakeLists.txt b/src/imports/testlib/.prev_CMakeLists.txt
index dad2b51b83..6e54d1ffcc 100644
--- a/src/imports/testlib/.prev_CMakeLists.txt
+++ b/src/imports/testlib/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## qmltestplugin Plugin:
#####################################################################
-add_qml_module(qmltestplugin
+qt_add_qml_module(qmltestplugin
URI "QtTest"
VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
CLASSNAME QTestQmlModule
diff --git a/src/imports/testlib/CMakeLists.txt b/src/imports/testlib/CMakeLists.txt
index bb33464ba7..eada3b6df6 100644
--- a/src/imports/testlib/CMakeLists.txt
+++ b/src/imports/testlib/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmltestplugin Plugin:
#####################################################################
-add_qml_module(qmltestplugin
+qt_add_qml_module(qmltestplugin
URI "QtTest"
VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
CLASSNAME QTestQmlModule
diff --git a/src/imports/wavefrontmesh/CMakeLists.txt b/src/imports/wavefrontmesh/CMakeLists.txt
index b43ca7656b..2e708c854e 100644
--- a/src/imports/wavefrontmesh/CMakeLists.txt
+++ b/src/imports/wavefrontmesh/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmlwavefrontmeshplugin Plugin:
#####################################################################
-add_qml_module(qmlwavefrontmeshplugin
+qt_add_qml_module(qmlwavefrontmeshplugin
URI "Qt.labs.wavefrontmesh"
VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
CLASSNAME QmlWavefrontMeshPlugin
diff --git a/src/imports/window/CMakeLists.txt b/src/imports/window/CMakeLists.txt
index 0f76e020e9..e031a6a28f 100644
--- a/src/imports/window/CMakeLists.txt
+++ b/src/imports/window/CMakeLists.txt
@@ -4,7 +4,7 @@
## windowplugin Plugin:
#####################################################################
-add_qml_module(windowplugin
+qt_add_qml_module(windowplugin
TARGET_PATH "QtQuick/Window.2"
URI "QtQuick.Window"
VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
diff --git a/src/imports/workerscript/CMakeLists.txt b/src/imports/workerscript/CMakeLists.txt
index 86487e5730..b9948cf84e 100644
--- a/src/imports/workerscript/CMakeLists.txt
+++ b/src/imports/workerscript/CMakeLists.txt
@@ -4,7 +4,7 @@
## workerscriptplugin Plugin:
#####################################################################
-add_qml_module(workerscriptplugin
+qt_add_qml_module(workerscriptplugin
TARGET_PATH "QtQml/WorkerScript.2"
URI "QtQml.WorkerScript"
VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt
index f7aca8859f..199c638cd9 100644
--- a/src/particles/CMakeLists.txt
+++ b/src/particles/CMakeLists.txt
@@ -4,7 +4,7 @@
## QuickParticles Module:
#####################################################################
-add_qt_module(QuickParticles
+qt_add_module(QuickParticles
INTERNAL_MODULE
SOURCES
qquickage.cpp qquickage_p.h
@@ -60,7 +60,7 @@ set(particles_resource_files
"particleresources/star.png"
)
-add_qt_resource(QuickParticles "particles"
+qt_add_resource(QuickParticles "particles"
PREFIX
"/"
FILES
@@ -89,7 +89,7 @@ set(particles1_resource_files
"shaders_ng/imageparticle_tabled.vert.qsb"
)
-add_qt_resource(QuickParticles "particles1"
+qt_add_resource(QuickParticles "particles1"
PREFIX
"/particles"
FILES
@@ -103,7 +103,7 @@ add_qt_resource(QuickParticles "particles1"
## Scopes:
#####################################################################
-extend_target(QuickParticles CONDITION MSVC
+qt_extend_target(QuickParticles CONDITION MSVC
DEFINES
_CRT_SECURE_NO_WARNINGS
)
@@ -111,7 +111,7 @@ extend_target(QuickParticles CONDITION MSVC
#### Keys ignored in scope 3:.:.:particles.pro:solaris-cc_x_:
# QMAKE_CXXFLAGS_RELEASE = "--O2"
-extend_target(QuickParticles CONDITION EXISTS "qqml_enable_gcov"
+qt_extend_target(QuickParticles CONDITION EXISTS "qqml_enable_gcov"
LIBRARIES
gcov
COMPILE_OPTIONS
@@ -120,7 +120,7 @@ extend_target(QuickParticles CONDITION EXISTS "qqml_enable_gcov"
-ftest-coverage
)
-extend_target(QuickParticles CONDITION QT_FEATURE_quick_shadereffect
+qt_extend_target(QuickParticles CONDITION QT_FEATURE_quick_shadereffect
SOURCES
qquickcustomparticle.cpp qquickcustomparticle_p.h
)
diff --git a/src/plugins/qmltooling/packetprotocol/CMakeLists.txt b/src/plugins/qmltooling/packetprotocol/CMakeLists.txt
index 7a557b3b3e..d12e30de7d 100644
--- a/src/plugins/qmltooling/packetprotocol/CMakeLists.txt
+++ b/src/plugins/qmltooling/packetprotocol/CMakeLists.txt
@@ -4,7 +4,7 @@
## PacketProtocol Module:
#####################################################################
-add_qt_module(PacketProtocol
+qt_add_module(PacketProtocol
STATIC
INTERNAL_MODULE
SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt
index f5c3064c2c..dc58cf3b30 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmldbg_debugger Plugin:
#####################################################################
-add_qt_plugin(qmldbg_debugger
+qt_add_plugin(qmldbg_debugger
TYPE qmltooling
CLASS_NAME QQmlDebuggerServiceFactory
SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt
index 8e6d45ab40..213901c75a 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmldbg_inspector Plugin:
#####################################################################
-add_qt_plugin(qmldbg_inspector
+qt_add_plugin(qmldbg_inspector
TYPE qmltooling
CLASS_NAME QQmlInspectorServiceFactory
SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt
index e12b45c8d3..e97c37cc62 100644
--- a/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmldbg_local Plugin:
#####################################################################
-add_qt_plugin(qmldbg_local
+qt_add_plugin(qmldbg_local
TYPE qmltooling
CLASS_NAME QLocalClientConnectionFactory
SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt
index 5b203a8955..002c575539 100644
--- a/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmldbg_messages Plugin:
#####################################################################
-add_qt_plugin(qmldbg_messages
+qt_add_plugin(qmldbg_messages
TYPE qmltooling
CLASS_NAME QDebugMessageServiceFactory
SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt
index 95bdce601f..bcea497c95 100644
--- a/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmldbg_native Plugin:
#####################################################################
-add_qt_plugin(qmldbg_native
+qt_add_plugin(qmldbg_native
TYPE qmltooling
CLASS_NAME QQmlNativeDebugConnectorFactory
SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt
index d93df65eb0..16396c3c97 100644
--- a/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmldbg_nativedebugger Plugin:
#####################################################################
-add_qt_plugin(qmldbg_nativedebugger
+qt_add_plugin(qmldbg_nativedebugger
TYPE qmltooling
CLASS_NAME QQmlNativeDebugServiceFactory
SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt
index 79636c8aea..02afaa3155 100644
--- a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmldbg_preview Plugin:
#####################################################################
-add_qt_plugin(qmldbg_preview
+qt_add_plugin(qmldbg_preview
TYPE qmltooling
CLASS_NAME QQmlPreviewServiceFactory
SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt
index 06eb52ecfc..3868e5c68d 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmldbg_profiler Plugin:
#####################################################################
-add_qt_plugin(qmldbg_profiler
+qt_add_plugin(qmldbg_profiler
TYPE qmltooling
CLASS_NAME QQmlProfilerServiceFactory
SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt
index 5afeaa1775..4931efb960 100644
--- a/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmldbg_quickprofiler Plugin:
#####################################################################
-add_qt_plugin(qmldbg_quickprofiler
+qt_add_plugin(qmldbg_quickprofiler
TYPE qmltooling
CLASS_NAME QQuickProfilerAdapterFactory
SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt
index 6fb864bc24..312302f193 100644
--- a/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmldbg_server Plugin:
#####################################################################
-add_qt_plugin(qmldbg_server
+qt_add_plugin(qmldbg_server
TYPE qmltooling
CLASS_NAME QQmlDebugServerFactory
SOURCES
diff --git a/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt
index cfc0503ea3..0b7a1cc981 100644
--- a/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmldbg_tcp Plugin:
#####################################################################
-add_qt_plugin(qmldbg_tcp
+qt_add_plugin(qmldbg_tcp
TYPE qmltooling
CLASS_NAME QTcpServerConnectionFactory
SOURCES
diff --git a/src/plugins/scenegraph/openvg/CMakeLists.txt b/src/plugins/scenegraph/openvg/CMakeLists.txt
index 4127556dad..bda18dd619 100644
--- a/src/plugins/scenegraph/openvg/CMakeLists.txt
+++ b/src/plugins/scenegraph/openvg/CMakeLists.txt
@@ -4,7 +4,7 @@
## qsgopenvgbackend Plugin:
#####################################################################
-add_qt_plugin(qsgopenvgbackend
+qt_add_plugin(qsgopenvgbackend
TYPE scenegraph
CLASS_NAME QSGOpenVGAdaptation
SOURCES
@@ -47,7 +47,7 @@ add_qt_plugin(qsgopenvgbackend
## Scopes:
#####################################################################
-extend_target(qsgopenvgbackend CONDITION QT_FEATURE_quick_sprite
+qt_extend_target(qsgopenvgbackend CONDITION QT_FEATURE_quick_sprite
SOURCES
qsgopenvgspritenode.cpp qsgopenvgspritenode.h
)
diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt
index 8f5ada93c6..92cb639ab1 100644
--- a/src/qml/.prev_CMakeLists.txt
+++ b/src/qml/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## Qml Module:
#####################################################################
-add_qt_module(Qml
+qt_add_module(Qml
PLUGIN_TYPES qmltooling
SOURCES
../3rdparty/llvm/include/llvm-c/DataTypes.h
@@ -338,24 +338,24 @@ qt_process_qlalr(
## Scopes:
#####################################################################
-extend_target(Qml CONDITION QT_FEATURE_qml_network
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_network
SOURCES
qml/qqmltypeloadernetworkreplyproxy.cpp qml/qqmltypeloadernetworkreplyproxy_p.h
PUBLIC_LIBRARIES
Qt::Network
)
-extend_target(Qml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+qt_extend_target(Qml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
LINK_OPTIONS
"/BASE:0x66000000"
)
-extend_target(Qml CONDITION MSVC
+qt_extend_target(Qml CONDITION MSVC
DEFINES
_CRT_SECURE_NO_WARNINGS
)
-extend_target(Qml CONDITION WIN32 AND NOT WINRT
+qt_extend_target(Qml CONDITION WIN32 AND NOT WINRT
SOURCES
../3rdparty/masm/wtf/OSAllocatorWin.cpp
PUBLIC_LIBRARIES
@@ -365,12 +365,12 @@ extend_target(Qml CONDITION WIN32 AND NOT WINRT
#### Keys ignored in scope 6:.:.:qml.pro:solaris-cc_x_:
# QMAKE_CXXFLAGS_RELEASE = "--O2"
-extend_target(Qml CONDITION GCC AND (TEST_architecture_arch STREQUAL "mips")
+qt_extend_target(Qml CONDITION GCC AND (TEST_architecture_arch STREQUAL "mips")
COMPILE_OPTIONS
-fno-reorder-blocks
)
-extend_target(Qml CONDITION EXISTS "qqml_enable_gcov"
+qt_extend_target(Qml CONDITION EXISTS "qqml_enable_gcov"
LIBRARIES
gcov
COMPILE_OPTIONS
@@ -379,7 +379,7 @@ extend_target(Qml CONDITION EXISTS "qqml_enable_gcov"
-ftest-coverage
)
-extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 19) AND (QT_CL_MINOR_VERSION EQUAL 00) AND (QT_CL_PATCH_VERSION GREATER 24212)
+qt_extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 19) AND (QT_CL_MINOR_VERSION EQUAL 00) AND (QT_CL_PATCH_VERSION GREATER 24212)
COMPILE_OPTIONS
-d2SSAOptimizer-
)
@@ -390,7 +390,7 @@ extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 19)
#### Keys ignored in scope 11:.:.:qml.pro:(QT_CLANG_MAJOR_VERSION GREATER 3) OR (QT_CLANG_MINOR_VERSION GREATER 3) OR (QT_APPLE_CLANG_MAJOR_VERSION GREATER 5) OR ( (QT_APPLE_CLANG_MAJOR_VERSION EQUAL 5) AND (QT_APPLE_CLANG_MINOR_VERSION GREATER 0) ):
# WERROR = "-Wno-error=unused-const-variable"
-extend_target(Qml CONDITION QT_FEATURE_qml_jit
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_jit
SOURCES
jit/qv4assemblercommon.cpp jit/qv4assemblercommon_p.h
jit/qv4baselineassembler.cpp jit/qv4baselineassembler_p.h
@@ -400,7 +400,7 @@ extend_target(Qml CONDITION QT_FEATURE_qml_jit
jit
)
-extend_target(Qml CONDITION QT_FEATURE_qml_animation
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_animation
SOURCES
animations/qabstractanimationjob.cpp animations/qabstractanimationjob_p.h
animations/qanimationgroupjob.cpp animations/qanimationgroupjob_p.h
@@ -430,12 +430,12 @@ extend_target(Qml CONDITION QT_FEATURE_qml_animation
# QML_COMPILE_HASH = "$$commit"
# commit = "$$system(git rev-parse HEAD)"
-extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
+qt_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
COMPILE_OPTIONS
-fno-strict-aliasing
)
-extend_target(Qml CONDITION QT_FEATURE_qml_debug
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_debug
SOURCES
debugger/qqmlabstractprofileradapter.cpp debugger/qqmlabstractprofileradapter_p.h
debugger/qqmlconfigurabledebugservice_p.h
@@ -452,100 +452,100 @@ extend_target(Qml CONDITION QT_FEATURE_qml_debug
jsruntime/qv4profiling.cpp
)
-extend_target(Qml CONDITION QT_FEATURE_qml_sequence_object
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_sequence_object
SOURCES
jsruntime/qv4sequenceobject.cpp jsruntime/qv4sequenceobject_p.h
)
-extend_target(Qml CONDITION UNIX
+qt_extend_target(Qml CONDITION UNIX
SOURCES
jsruntime/qv4compilationunitmapper_unix.cpp
jsruntime/qv4functiontable_unix.cpp
)
-extend_target(Qml CONDITION WIN32
+qt_extend_target(Qml CONDITION WIN32
SOURCES
jsruntime/qv4compilationunitmapper_win.cpp
DEFINES
NOMINMAX
)
-extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "x86_64") AND WIN32 AND NOT WINRT
+qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "x86_64") AND WIN32 AND NOT WINRT
SOURCES
jsruntime/qv4functiontable_win64.cpp
)
-extend_target(Qml CONDITION WIN32 AND (WINRT OR NOT (TEST_architecture_arch STREQUAL "x86_64"))
+qt_extend_target(Qml CONDITION WIN32 AND (WINRT OR NOT (TEST_architecture_arch STREQUAL "x86_64"))
SOURCES
jsruntime/qv4functiontable_noop.cpp
)
-extend_target(Qml CONDITION valgrind
+qt_extend_target(Qml CONDITION valgrind
DEFINES
V4_USE_VALGRIND
)
-extend_target(Qml CONDITION heaptrack
+qt_extend_target(Qml CONDITION heaptrack
DEFINES
V4_USE_HEAPTRACK
)
-extend_target(Qml CONDITION QT_FEATURE_qml_xml_http_request
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_xml_http_request
SOURCES
qml/qqmlxmlhttprequest.cpp qml/qqmlxmlhttprequest_p.h
)
-extend_target(Qml CONDITION QT_FEATURE_qml_locale
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_locale
SOURCES
qml/qqmllocale.cpp qml/qqmllocale_p.h
)
-extend_target(Qml CONDITION ANDROID
+qt_extend_target(Qml CONDITION ANDROID
DEFINES
LIBS_SUFFIX='\\"_${CMAKE_SYSTEM_PROCESSOR}.so\\"'
)
-extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_)
+qt_extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_)
LIBRARIES
rt
)
-extend_target(Qml CONDITION QT_FEATURE_qml_itemmodel
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_itemmodel
SOURCES
types/qqmlmodelindexvaluetype.cpp types/qqmlmodelindexvaluetype_p.h
)
-extend_target(Qml CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
+qt_extend_target(Qml CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
DEFINES
WTF_USE_UDIS86=1
)
-extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
+qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
DEFINES
WTF_USE_ARMV7_DISASSEMBLER=1
)
-extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
+qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
DEFINES
WTF_USE_ARM64_DISASSEMBLER=1
)
-extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
+qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
DEFINES
WTF_USE_MIPS32_DISASSEMBLER=1
)
-extend_target(Qml CONDITION NOT disassembler
+qt_extend_target(Qml CONDITION NOT disassembler
DEFINES
WTF_USE_UDIS86=0
)
-extend_target(Qml CONDITION CMAKE_BUILD_TYPE STREQUAL Release
+qt_extend_target(Qml CONDITION CMAKE_BUILD_TYPE STREQUAL Release
DEFINES
NDEBUG
)
-extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
+qt_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
COMPILE_OPTIONS
-Wno-expansion-to-defined
)
@@ -553,22 +553,22 @@ extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND N
#### Keys ignored in scope 65:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6):
# QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined"
-extend_target(Qml CONDITION WINRT
+qt_extend_target(Qml CONDITION WINRT
SOURCES
../3rdparty/masm/wtf/OSAllocatorWinRT.cpp
)
-extend_target(Qml CONDITION INTEGRITY
+qt_extend_target(Qml CONDITION INTEGRITY
SOURCES
../3rdparty/masm/wtf/OSAllocatorIntegrity.cpp
)
-extend_target(Qml CONDITION UNIX AND NOT INTEGRITY AND NOT WINRT
+qt_extend_target(Qml CONDITION UNIX AND NOT INTEGRITY AND NOT WINRT
SOURCES
../3rdparty/masm/wtf/OSAllocatorPosix.cpp
)
-extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
+qt_extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
SOURCES
../3rdparty/masm/disassembler/udis86/udis86.c
../3rdparty/masm/disassembler/udis86/udis86_decode.c
@@ -596,20 +596,20 @@ extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
#### Keys ignored in scope 76:.:../3rdparty/masm:../3rdparty/masm/masm.pri:else:
# GENERATEDDIR = "$$GENERATEDDIR/release"
-extend_target(Qml CONDITION (NOT c++11 AND NOT ICC) AND (CLANG)
+qt_extend_target(Qml CONDITION (NOT c++11 AND NOT ICC) AND (CLANG)
COMPILE_OPTIONS
-Wno-c++0x-extensions
-Wno-c++11-extensions
)
-extend_target(Qml CONDITION (((NOT c++11 AND NOT ICC) AND (NOT (CLANG))) AND (GCC)) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 4) OR (QT_COMPILER_VERSION_MINOR STRGREATER 5))
+qt_extend_target(Qml CONDITION (((NOT c++11 AND NOT ICC) AND (NOT (CLANG))) AND (GCC)) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 4) OR (QT_COMPILER_VERSION_MINOR STRGREATER 5))
COMPILE_OPTIONS
-Wno-c++0x-compat
)
qt_create_tracepoints(Qml qtqml.tracepoints)
-add_qt_docs(Qml
+qt_add_docs(Qml
doc/qtqml.qdocconf
)
diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt
index df2cdf417d..3d476ad6f6 100644
--- a/src/qml/CMakeLists.txt
+++ b/src/qml/CMakeLists.txt
@@ -4,7 +4,7 @@
## Qml Module:
#####################################################################
-add_qt_module(Qml
+qt_add_module(Qml
PLUGIN_TYPES qmltooling
SOURCES
../3rdparty/llvm/include/llvm-c/DataTypes.h
@@ -345,24 +345,24 @@ qt_declarative_generate_reg_exp_jit_tables(Qml)
## Scopes:
#####################################################################
-extend_target(Qml CONDITION QT_FEATURE_qml_network
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_network
SOURCES
qml/qqmltypeloadernetworkreplyproxy.cpp qml/qqmltypeloadernetworkreplyproxy_p.h
PUBLIC_LIBRARIES
Qt::Network
)
-extend_target(Qml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+qt_extend_target(Qml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
LINK_OPTIONS
"/BASE:0x66000000"
)
-extend_target(Qml CONDITION MSVC
+qt_extend_target(Qml CONDITION MSVC
DEFINES
_CRT_SECURE_NO_WARNINGS
)
-extend_target(Qml CONDITION WIN32 AND NOT WINRT
+qt_extend_target(Qml CONDITION WIN32 AND NOT WINRT
SOURCES
../3rdparty/masm/wtf/OSAllocatorWin.cpp
PUBLIC_LIBRARIES
@@ -372,12 +372,12 @@ extend_target(Qml CONDITION WIN32 AND NOT WINRT
#### Keys ignored in scope 6:.:.:qml.pro:solaris-cc_x_:
# QMAKE_CXXFLAGS_RELEASE = "--O2"
-extend_target(Qml CONDITION GCC AND (TEST_architecture_arch STREQUAL "mips")
+qt_extend_target(Qml CONDITION GCC AND (TEST_architecture_arch STREQUAL "mips")
COMPILE_OPTIONS
-fno-reorder-blocks
)
-extend_target(Qml CONDITION EXISTS "qqml_enable_gcov"
+qt_extend_target(Qml CONDITION EXISTS "qqml_enable_gcov"
LIBRARIES
gcov
COMPILE_OPTIONS
@@ -386,7 +386,7 @@ extend_target(Qml CONDITION EXISTS "qqml_enable_gcov"
-ftest-coverage
)
-extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 19) AND (QT_CL_MINOR_VERSION EQUAL 00) AND (QT_CL_PATCH_VERSION GREATER 24212)
+qt_extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 19) AND (QT_CL_MINOR_VERSION EQUAL 00) AND (QT_CL_PATCH_VERSION GREATER 24212)
COMPILE_OPTIONS
-d2SSAOptimizer-
)
@@ -397,7 +397,7 @@ extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 19)
#### Keys ignored in scope 11:.:.:qml.pro:(QT_CLANG_MAJOR_VERSION GREATER 3) OR (QT_CLANG_MINOR_VERSION GREATER 3) OR (QT_APPLE_CLANG_MAJOR_VERSION GREATER 5) OR ( (QT_APPLE_CLANG_MAJOR_VERSION EQUAL 5) AND (QT_APPLE_CLANG_MINOR_VERSION GREATER 0) ):
# WERROR = "-Wno-error=unused-const-variable"
-extend_target(Qml CONDITION QT_FEATURE_qml_jit
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_jit
SOURCES
jit/qv4assemblercommon.cpp jit/qv4assemblercommon_p.h
jit/qv4baselineassembler.cpp jit/qv4baselineassembler_p.h
@@ -407,7 +407,7 @@ extend_target(Qml CONDITION QT_FEATURE_qml_jit
jit
)
-extend_target(Qml CONDITION QT_FEATURE_qml_animation
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_animation
SOURCES
animations/qabstractanimationjob.cpp animations/qabstractanimationjob_p.h
animations/qanimationgroupjob.cpp animations/qanimationgroupjob_p.h
@@ -437,12 +437,12 @@ extend_target(Qml CONDITION QT_FEATURE_qml_animation
# QML_COMPILE_HASH = "$$commit"
# commit = "$$system(git rev-parse HEAD)"
-extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
+qt_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
COMPILE_OPTIONS
-fno-strict-aliasing
)
-extend_target(Qml CONDITION QT_FEATURE_qml_debug
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_debug
SOURCES
debugger/qqmlabstractprofileradapter.cpp debugger/qqmlabstractprofileradapter_p.h
debugger/qqmlconfigurabledebugservice_p.h
@@ -459,100 +459,100 @@ extend_target(Qml CONDITION QT_FEATURE_qml_debug
jsruntime/qv4profiling.cpp
)
-extend_target(Qml CONDITION QT_FEATURE_qml_sequence_object
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_sequence_object
SOURCES
jsruntime/qv4sequenceobject.cpp jsruntime/qv4sequenceobject_p.h
)
-extend_target(Qml CONDITION UNIX
+qt_extend_target(Qml CONDITION UNIX
SOURCES
jsruntime/qv4compilationunitmapper_unix.cpp
jsruntime/qv4functiontable_unix.cpp
)
-extend_target(Qml CONDITION WIN32
+qt_extend_target(Qml CONDITION WIN32
SOURCES
jsruntime/qv4compilationunitmapper_win.cpp
DEFINES
NOMINMAX
)
-extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "x86_64") AND WIN32 AND NOT WINRT
+qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "x86_64") AND WIN32 AND NOT WINRT
SOURCES
jsruntime/qv4functiontable_win64.cpp
)
-extend_target(Qml CONDITION WIN32 AND (WINRT OR NOT (TEST_architecture_arch STREQUAL "x86_64"))
+qt_extend_target(Qml CONDITION WIN32 AND (WINRT OR NOT (TEST_architecture_arch STREQUAL "x86_64"))
SOURCES
jsruntime/qv4functiontable_noop.cpp
)
-extend_target(Qml CONDITION valgrind
+qt_extend_target(Qml CONDITION valgrind
DEFINES
V4_USE_VALGRIND
)
-extend_target(Qml CONDITION heaptrack
+qt_extend_target(Qml CONDITION heaptrack
DEFINES
V4_USE_HEAPTRACK
)
-extend_target(Qml CONDITION QT_FEATURE_qml_xml_http_request
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_xml_http_request
SOURCES
qml/qqmlxmlhttprequest.cpp qml/qqmlxmlhttprequest_p.h
)
-extend_target(Qml CONDITION QT_FEATURE_qml_locale
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_locale
SOURCES
qml/qqmllocale.cpp qml/qqmllocale_p.h
)
-extend_target(Qml CONDITION ANDROID
+qt_extend_target(Qml CONDITION ANDROID
DEFINES
LIBS_SUFFIX='\\"_${CMAKE_SYSTEM_PROCESSOR}.so\\"'
)
-extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_)
+qt_extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_)
LIBRARIES
rt
)
-extend_target(Qml CONDITION QT_FEATURE_qml_itemmodel
+qt_extend_target(Qml CONDITION QT_FEATURE_qml_itemmodel
SOURCES
types/qqmlmodelindexvaluetype.cpp types/qqmlmodelindexvaluetype_p.h
)
-extend_target(Qml CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
+qt_extend_target(Qml CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
DEFINES
WTF_USE_UDIS86=1
)
-extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
+qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
DEFINES
WTF_USE_ARMV7_DISASSEMBLER=1
)
-extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
+qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
DEFINES
WTF_USE_ARM64_DISASSEMBLER=1
)
-extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
+qt_extend_target(Qml CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
DEFINES
WTF_USE_MIPS32_DISASSEMBLER=1
)
-extend_target(Qml CONDITION NOT disassembler
+qt_extend_target(Qml CONDITION NOT disassembler
DEFINES
WTF_USE_UDIS86=0
)
-extend_target(Qml CONDITION CMAKE_BUILD_TYPE STREQUAL Release
+qt_extend_target(Qml CONDITION CMAKE_BUILD_TYPE STREQUAL Release
DEFINES
NDEBUG
)
-extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
+qt_extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
COMPILE_OPTIONS
-Wno-expansion-to-defined
)
@@ -560,22 +560,22 @@ extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND N
#### Keys ignored in scope 65:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6):
# QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined"
-extend_target(Qml CONDITION WINRT
+qt_extend_target(Qml CONDITION WINRT
SOURCES
../3rdparty/masm/wtf/OSAllocatorWinRT.cpp
)
-extend_target(Qml CONDITION INTEGRITY
+qt_extend_target(Qml CONDITION INTEGRITY
SOURCES
../3rdparty/masm/wtf/OSAllocatorIntegrity.cpp
)
-extend_target(Qml CONDITION UNIX AND NOT INTEGRITY AND NOT WINRT
+qt_extend_target(Qml CONDITION UNIX AND NOT INTEGRITY AND NOT WINRT
SOURCES
../3rdparty/masm/wtf/OSAllocatorPosix.cpp
)
-extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
+qt_extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
SOURCES
../3rdparty/masm/disassembler/udis86/udis86.c
../3rdparty/masm/disassembler/udis86/udis86_decode.c
@@ -603,20 +603,20 @@ extend_target(Qml CONDITION DEFINES___contains___WTF_USE_UDIS86=1
#### Keys ignored in scope 76:.:../3rdparty/masm:../3rdparty/masm/masm.pri:else:
# GENERATEDDIR = "$$GENERATEDDIR/release"
-extend_target(Qml CONDITION (NOT c++11 AND NOT ICC) AND (CLANG)
+qt_extend_target(Qml CONDITION (NOT c++11 AND NOT ICC) AND (CLANG)
COMPILE_OPTIONS
-Wno-c++0x-extensions
-Wno-c++11-extensions
)
-extend_target(Qml CONDITION (((NOT c++11 AND NOT ICC) AND (NOT (CLANG))) AND (GCC)) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 4) OR (QT_COMPILER_VERSION_MINOR STRGREATER 5))
+qt_extend_target(Qml CONDITION (((NOT c++11 AND NOT ICC) AND (NOT (CLANG))) AND (GCC)) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 4) OR (QT_COMPILER_VERSION_MINOR STRGREATER 5))
COMPILE_OPTIONS
-Wno-c++0x-compat
)
qt_create_tracepoints(Qml qtqml.tracepoints)
-add_qt_docs(Qml
+qt_add_docs(Qml
doc/qtqml.qdocconf
)
diff --git a/src/qmldebug/CMakeLists.txt b/src/qmldebug/CMakeLists.txt
index d39bf7d69b..048293312f 100644
--- a/src/qmldebug/CMakeLists.txt
+++ b/src/qmldebug/CMakeLists.txt
@@ -4,7 +4,7 @@
## QmlDebug Module:
#####################################################################
-add_qt_module(QmlDebug
+qt_add_module(QmlDebug
STATIC
INTERNAL_MODULE
SOURCES
diff --git a/src/qmldevtools/.prev_CMakeLists.txt b/src/qmldevtools/.prev_CMakeLists.txt
index 32e05de6b2..1497d1bf95 100644
--- a/src/qmldevtools/.prev_CMakeLists.txt
+++ b/src/qmldevtools/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## QmlDevTools Module:
#####################################################################
-add_qt_module(QmlDevTools
+qt_add_module(QmlDevTools
STATIC
INTERNAL_MODULE
NO_SYNC_QT
@@ -86,7 +86,7 @@ qt_process_qlalr(
# QML_COMPILE_HASH = "$$commit"
# commit = "$$system(git rev-parse HEAD)"
-extend_target(QmlDevTools CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
+qt_extend_target(QmlDevTools CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
COMPILE_OPTIONS
-fno-strict-aliasing
)
diff --git a/src/qmldevtools/CMakeLists.txt b/src/qmldevtools/CMakeLists.txt
index f819a81b0f..d7db2378ee 100644
--- a/src/qmldevtools/CMakeLists.txt
+++ b/src/qmldevtools/CMakeLists.txt
@@ -4,7 +4,7 @@
## QmlDevTools Module:
#####################################################################
-add_qt_module(QmlDevTools
+qt_add_module(QmlDevTools
STATIC
INTERNAL_MODULE
NO_SYNC_QT
@@ -114,7 +114,7 @@ add_dependencies(QmlDevTools Qml)
# QML_COMPILE_HASH = "$$commit"
# commit = "$$system(git rev-parse HEAD)"
-extend_target(QmlDevTools CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
+qt_extend_target(QmlDevTools CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
COMPILE_OPTIONS
-fno-strict-aliasing
)
diff --git a/src/qmlmodels/CMakeLists.txt b/src/qmlmodels/CMakeLists.txt
index 360b2dfa96..9cfafd677d 100644
--- a/src/qmlmodels/CMakeLists.txt
+++ b/src/qmlmodels/CMakeLists.txt
@@ -4,7 +4,7 @@
## QmlModels Module:
#####################################################################
-add_qt_module(QmlModels
+qt_add_module(QmlModels
SOURCES
qqmlchangeset.cpp qqmlchangeset_p.h
qqmlmodelsmodule.cpp qqmlmodelsmodule_p.h
@@ -24,28 +24,28 @@ add_qt_module(QmlModels
## Scopes:
#####################################################################
-extend_target(QmlModels CONDITION QT_FEATURE_qml_object_model
+qt_extend_target(QmlModels CONDITION QT_FEATURE_qml_object_model
SOURCES
qqmlinstantiator.cpp qqmlinstantiator_p.h
qqmlinstantiator_p_p.h
qqmlobjectmodel.cpp qqmlobjectmodel_p.h
)
-extend_target(QmlModels CONDITION QT_FEATURE_qml_table_model
+qt_extend_target(QmlModels CONDITION QT_FEATURE_qml_table_model
SOURCES
qqmltableinstancemodel.cpp qqmltableinstancemodel_p.h
qqmltablemodel.cpp qqmltablemodel_p.h
qqmltablemodelcolumn.cpp qqmltablemodelcolumn_p.h
)
-extend_target(QmlModels CONDITION QT_FEATURE_qml_list_model
+qt_extend_target(QmlModels CONDITION QT_FEATURE_qml_list_model
SOURCES
qqmllistmodel.cpp qqmllistmodel_p.h
qqmllistmodel_p_p.h
qqmllistmodelworkeragent.cpp qqmllistmodelworkeragent_p.h
)
-extend_target(QmlModels CONDITION QT_FEATURE_qml_delegate_model
+qt_extend_target(QmlModels CONDITION QT_FEATURE_qml_delegate_model
SOURCES
qqmladaptormodel.cpp qqmladaptormodel_p.h
qqmldelegatecomponent.cpp qqmldelegatecomponent_p.h
@@ -55,7 +55,7 @@ extend_target(QmlModels CONDITION QT_FEATURE_qml_delegate_model
qqmllistcompositor.cpp qqmllistcompositor_p.h
qquickpackage.cpp qquickpackage_p.h
)
-add_qt_docs(QmlModels
+qt_add_docs(QmlModels
doc/qtqmlmodels.qdocconf
)
diff --git a/src/qmltest/.prev_CMakeLists.txt b/src/qmltest/.prev_CMakeLists.txt
index e4a5ed71ef..ee1b7d39ab 100644
--- a/src/qmltest/.prev_CMakeLists.txt
+++ b/src/qmltest/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## QuickTest Module:
#####################################################################
-add_qt_module(QuickTest
+qt_add_module(QuickTest
QMAKE_MODULE_CONFIG $${QT.testlib.CONFIG}
SOURCES
qtestoptions_p.h
@@ -35,18 +35,18 @@ add_qt_module(QuickTest
## Scopes:
#####################################################################
-extend_target(QuickTest CONDITION TARGET Qt::Widgets
+qt_extend_target(QuickTest CONDITION TARGET Qt::Widgets
DEFINES
QT_QMLTEST_WITH_WIDGETS
PUBLIC_LIBRARIES
Qt::Widgets
)
-extend_target(QuickTest CONDITION QT_FEATURE_qml_debug
+qt_extend_target(QuickTest CONDITION QT_FEATURE_qml_debug
DEFINES
QT_QML_DEBUG_NO_WARNING
)
-add_qt_docs(QuickTest
+qt_add_docs(QuickTest
doc/qtqmltest.qdocconf
)
diff --git a/src/qmltest/CMakeLists.txt b/src/qmltest/CMakeLists.txt
index d576d86036..4760481e35 100644
--- a/src/qmltest/CMakeLists.txt
+++ b/src/qmltest/CMakeLists.txt
@@ -4,7 +4,7 @@
## QuickTest Module:
#####################################################################
-add_qt_module(QuickTest
+qt_add_module(QuickTest
QMAKE_MODULE_CONFIG $${QT.testlib.CONFIG}
SOURCES
qtestoptions_p.h
@@ -36,18 +36,18 @@ add_qt_module(QuickTest
## Scopes:
#####################################################################
-extend_target(QuickTest CONDITION TARGET Qt::Widgets
+qt_extend_target(QuickTest CONDITION TARGET Qt::Widgets
DEFINES
QT_QMLTEST_WITH_WIDGETS
PUBLIC_LIBRARIES
Qt::Widgets
)
-extend_target(QuickTest CONDITION QT_FEATURE_qml_debug
+qt_extend_target(QuickTest CONDITION QT_FEATURE_qml_debug
DEFINES
QT_QML_DEBUG_NO_WARNING
)
-add_qt_docs(QuickTest
+qt_add_docs(QuickTest
doc/qtqmltest.qdocconf
)
diff --git a/src/qmlworkerscript/.prev_CMakeLists.txt b/src/qmlworkerscript/.prev_CMakeLists.txt
index 21eba19ebc..215231b5b8 100644
--- a/src/qmlworkerscript/.prev_CMakeLists.txt
+++ b/src/qmlworkerscript/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## QmlWorkerScript Module:
#####################################################################
-add_qt_module(QmlWorkerScript
+qt_add_module(QmlWorkerScript
SOURCES
qqmlworkerscriptmodule.cpp qqmlworkerscriptmodule_p.h
qquickworkerscript.cpp qquickworkerscript_p.h
@@ -48,49 +48,49 @@ add_qt_module(QmlWorkerScript
## Scopes:
#####################################################################
-extend_target(QmlWorkerScript CONDITION WIN32
+qt_extend_target(QmlWorkerScript CONDITION WIN32
DEFINES
NOMINMAX
)
-extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
+qt_extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
DEFINES
WTF_USE_UDIS86=1
)
-extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
+qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
DEFINES
WTF_USE_ARMV7_DISASSEMBLER=1
)
-extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
+qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
DEFINES
WTF_USE_ARM64_DISASSEMBLER=1
)
-extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
+qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
DEFINES
WTF_USE_MIPS32_DISASSEMBLER=1
)
-extend_target(QmlWorkerScript CONDITION NOT disassembler
+qt_extend_target(QmlWorkerScript CONDITION NOT disassembler
DEFINES
WTF_USE_UDIS86=0
)
-extend_target(QmlWorkerScript CONDITION CMAKE_BUILD_TYPE STREQUAL Release
+qt_extend_target(QmlWorkerScript CONDITION CMAKE_BUILD_TYPE STREQUAL Release
DEFINES
NDEBUG
)
-extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
+qt_extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
COMPILE_OPTIONS
-Wno-expansion-to-defined
)
#### Keys ignored in scope 12:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6):
# QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined"
-add_qt_docs(QmlWorkerScript
+qt_add_docs(QmlWorkerScript
doc/qtqmlworkerscript.qdocconf
)
diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt
index 08877cb2de..297e0404d9 100644
--- a/src/qmlworkerscript/CMakeLists.txt
+++ b/src/qmlworkerscript/CMakeLists.txt
@@ -4,7 +4,7 @@
## QmlWorkerScript Module:
#####################################################################
-add_qt_module(QmlWorkerScript
+qt_add_module(QmlWorkerScript
SOURCES
qqmlworkerscriptmodule.cpp qqmlworkerscriptmodule_p.h
qquickworkerscript.cpp qquickworkerscript_p.h
@@ -48,49 +48,49 @@ add_qt_module(QmlWorkerScript
## Scopes:
#####################################################################
-extend_target(QmlWorkerScript CONDITION WIN32
+qt_extend_target(QmlWorkerScript CONDITION WIN32
DEFINES
NOMINMAX
)
-extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
+qt_extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
DEFINES
WTF_USE_UDIS86=1
)
-extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
+qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
DEFINES
WTF_USE_ARMV7_DISASSEMBLER=1
)
-extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
+qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
DEFINES
WTF_USE_ARM64_DISASSEMBLER=1
)
-extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
+qt_extend_target(QmlWorkerScript CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
DEFINES
WTF_USE_MIPS32_DISASSEMBLER=1
)
-extend_target(QmlWorkerScript CONDITION NOT disassembler
+qt_extend_target(QmlWorkerScript CONDITION NOT disassembler
DEFINES
WTF_USE_UDIS86=0
)
-extend_target(QmlWorkerScript CONDITION CMAKE_BUILD_TYPE STREQUAL Release
+qt_extend_target(QmlWorkerScript CONDITION CMAKE_BUILD_TYPE STREQUAL Release
DEFINES
NDEBUG
)
-extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
+qt_extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
COMPILE_OPTIONS
-Wno-expansion-to-defined
)
#### Keys ignored in scope 12:.:../3rdparty/masm:../3rdparty/masm/masm-defs.pri:(QT_COMPILER_VERSION_MAJOR STRGREATER 6):
# QMAKE_CXXFLAGS_WARN_ON = "-Wno-expansion-to-defined"
-add_qt_docs(QmlWorkerScript
+qt_add_docs(QmlWorkerScript
doc/qtqmlworkerscript.qdocconf
)
diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt
index 7b6e7076a7..772848eb11 100644
--- a/src/quick/CMakeLists.txt
+++ b/src/quick/CMakeLists.txt
@@ -4,7 +4,7 @@
## Quick Module:
#####################################################################
-add_qt_module(Quick
+qt_add_module(Quick
PLUGIN_TYPES scenegraph
SOURCES
handlers/qquickdragaxis.cpp handlers/qquickdragaxis_p.h
@@ -309,7 +309,7 @@ set(scenegraph_resource_files
"shaders_ng/visualization.vert.qsb"
)
-add_qt_resource(Quick "scenegraph"
+qt_add_resource(Quick "scenegraph"
PREFIX
"/qt-project.org/scenegraph"
BASE
@@ -328,7 +328,7 @@ set(items_resource_files
"shaders/shadereffectfallback_core.vert"
)
-add_qt_resource(Quick "items"
+qt_add_resource(Quick "items"
PREFIX
"/qt-project.org/items"
BASE
@@ -351,12 +351,12 @@ endif()
## Scopes:
#####################################################################
-extend_target(Quick CONDITION QT_FEATURE_qml_network
+qt_extend_target(Quick CONDITION QT_FEATURE_qml_network
LIBRARIES
Qt::Network
)
-extend_target(Quick CONDITION MSVC
+qt_extend_target(Quick CONDITION MSVC
DEFINES
_CRT_SECURE_NO_WARNINGS
)
@@ -364,12 +364,12 @@ extend_target(Quick CONDITION MSVC
#### Keys ignored in scope 4:.:.:quick.pro:solaris-cc_x_:
# QMAKE_CXXFLAGS_RELEASE = "--O2"
-extend_target(Quick CONDITION WIN32 AND NOT WINRT
+qt_extend_target(Quick CONDITION WIN32 AND NOT WINRT
PUBLIC_LIBRARIES
user32
)
-extend_target(Quick CONDITION EXISTS "qqml_enable_gcov"
+qt_extend_target(Quick CONDITION EXISTS "qqml_enable_gcov"
LIBRARIES
gcov
COMPILE_OPTIONS
@@ -378,7 +378,7 @@ extend_target(Quick CONDITION EXISTS "qqml_enable_gcov"
-ftest-coverage
)
-extend_target(Quick CONDITION QT_FEATURE_quick_designer
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_designer
SOURCES
designer/qqmldesignermetaobject.cpp designer/qqmldesignermetaobject_p.h
designer/qquickdesignercustomobjectdata.cpp designer/qquickdesignercustomobjectdata_p.h
@@ -392,7 +392,7 @@ extend_target(Quick CONDITION QT_FEATURE_quick_designer
designer/qquickdesignerwindowmanager.cpp designer/qquickdesignerwindowmanager_p.h
)
-extend_target(Quick CONDITION QT_FEATURE_accessibility
+qt_extend_target(Quick CONDITION QT_FEATURE_accessibility
SOURCES
accessible/qaccessiblequickitem.cpp accessible/qaccessiblequickitem_p.h
accessible/qaccessiblequickview.cpp accessible/qaccessiblequickview_p.h
@@ -407,24 +407,24 @@ extend_target(Quick CONDITION QT_FEATURE_accessibility
Qt::Qml
)
-extend_target(Quick CONDITION QT_FEATURE_qml_debug
+qt_extend_target(Quick CONDITION QT_FEATURE_qml_debug
SOURCES
util/qquickprofiler.cpp
)
-extend_target(Quick CONDITION QT_FEATURE_shortcut
+qt_extend_target(Quick CONDITION QT_FEATURE_shortcut
SOURCES
util/qquickshortcut.cpp util/qquickshortcut_p.h
)
-extend_target(Quick CONDITION QT_FEATURE_quick_path
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_path
SOURCES
util/qquickpath.cpp util/qquickpath_p.h
util/qquickpath_p_p.h
util/qquickpathinterpolator.cpp util/qquickpathinterpolator_p.h
)
-extend_target(Quick CONDITION QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3
+qt_extend_target(Quick CONDITION QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3
SOURCES
items/qquickframebufferobject.cpp items/qquickframebufferobject.h
items/qquickopenglinfo.cpp items/qquickopenglinfo_p.h
@@ -459,17 +459,17 @@ extend_target(Quick CONDITION QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FE
scenegraph/util/qsgshadersourcebuilder.cpp scenegraph/util/qsgshadersourcebuilder_p.h
)
-extend_target(Quick CONDITION QT_FEATURE_thread AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)
+qt_extend_target(Quick CONDITION QT_FEATURE_thread AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)
SOURCES
scenegraph/qsgthreadedrenderloop.cpp scenegraph/qsgthreadedrenderloop_p.h
)
-extend_target(Quick CONDITION QT_FEATURE_quick_sprite AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_sprite AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)
SOURCES
scenegraph/qsgdefaultspritenode.cpp scenegraph/qsgdefaultspritenode_p.h
)
-extend_target(Quick CONDITION QT_FEATURE_quick_sprite
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_sprite
SOURCES
items/qquickanimatedsprite.cpp items/qquickanimatedsprite_p.h
items/qquickanimatedsprite_p_p.h
@@ -480,29 +480,29 @@ extend_target(Quick CONDITION QT_FEATURE_quick_sprite
scenegraph/adaptations/software/qsgsoftwarespritenode.cpp scenegraph/adaptations/software/qsgsoftwarespritenode_p.h
)
-extend_target(Quick CONDITION QT_FEATURE_thread
+qt_extend_target(Quick CONDITION QT_FEATURE_thread
SOURCES
scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop.cpp scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop_p.h
)
-extend_target(Quick CONDITION QT_FEATURE_quick_draganddrop
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_draganddrop
SOURCES
items/qquickdrag.cpp items/qquickdrag_p.h
items/qquickdroparea.cpp items/qquickdroparea_p.h
)
-extend_target(Quick CONDITION QT_FEATURE_quick_animatedimage
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_animatedimage
SOURCES
items/qquickanimatedimage.cpp items/qquickanimatedimage_p.h
items/qquickanimatedimage_p_p.h
)
-extend_target(Quick CONDITION QT_FEATURE_quick_gridview
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_gridview
SOURCES
items/qquickgridview.cpp items/qquickgridview_p.h
)
-extend_target(Quick CONDITION QT_FEATURE_quick_itemview
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_itemview
SOURCES
items/qquickitemview.cpp items/qquickitemview_p.h
items/qquickitemview_p_p.h
@@ -510,46 +510,46 @@ extend_target(Quick CONDITION QT_FEATURE_quick_itemview
items/qquickitemviewfxitem_p_p.h
)
-extend_target(Quick CONDITION QT_FEATURE_quick_viewtransitions
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_viewtransitions
SOURCES
items/qquickitemviewtransition.cpp items/qquickitemviewtransition_p.h
)
-extend_target(Quick CONDITION QT_FEATURE_quick_listview
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_listview
SOURCES
items/qquicklistview.cpp items/qquicklistview_p.h
)
-extend_target(Quick CONDITION QT_FEATURE_quick_tableview
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_tableview
SOURCES
items/qquicktableview.cpp items/qquicktableview_p.h
items/qquicktableview_p_p.h
)
-extend_target(Quick CONDITION QT_FEATURE_quick_pathview
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_pathview
SOURCES
items/qquickpathview.cpp items/qquickpathview_p.h
items/qquickpathview_p_p.h
)
-extend_target(Quick CONDITION QT_FEATURE_quick_positioners
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_positioners
SOURCES
items/qquickpositioners.cpp items/qquickpositioners_p.h
items/qquickpositioners_p_p.h
)
-extend_target(Quick CONDITION QT_FEATURE_quick_flipable
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_flipable
SOURCES
items/qquickflipable.cpp items/qquickflipable_p.h
)
-extend_target(Quick CONDITION QT_FEATURE_quick_repeater
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_repeater
SOURCES
items/qquickrepeater.cpp items/qquickrepeater_p.h
items/qquickrepeater_p_p.h
)
-extend_target(Quick CONDITION QT_FEATURE_quick_shadereffect
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_shadereffect
SOURCES
items/qquickgenericshadereffect.cpp items/qquickgenericshadereffect_p.h
items/qquickshadereffect.cpp items/qquickshadereffect_p.h
@@ -557,7 +557,7 @@ extend_target(Quick CONDITION QT_FEATURE_quick_shadereffect
items/qquickshadereffectsource.cpp items/qquickshadereffectsource_p.h
)
-extend_target(Quick CONDITION QT_FEATURE_opengl AND QT_FEATURE_quick_shadereffect
+qt_extend_target(Quick CONDITION QT_FEATURE_opengl AND QT_FEATURE_quick_shadereffect
SOURCES
items/qquickopenglshadereffect.cpp items/qquickopenglshadereffect_p.h
items/qquickopenglshadereffectnode.cpp items/qquickopenglshadereffectnode_p.h
@@ -566,7 +566,7 @@ extend_target(Quick CONDITION QT_FEATURE_opengl AND QT_FEATURE_quick_shadereffec
#### Keys ignored in scope 40:.:items:items/items.pri:QT_FEATURE_opengl:
# OTHER_FILES = "$$PWD/shaders/shadereffect.vert" "$$PWD/shaders/shadereffect.frag" "$$PWD/shaders/shadereffectfallback.vert" "$$PWD/shaders/shadereffectfallback.frag" "$$PWD/shaders/shadereffect_core.vert" "$$PWD/shaders/shadereffect_core.frag" "$$PWD/shaders/shadereffectfallback_core.vert" "$$PWD/shaders/shadereffectfallback_core.frag"
-extend_target(Quick CONDITION QT_FEATURE_quick_canvas
+qt_extend_target(Quick CONDITION QT_FEATURE_quick_canvas
SOURCES
items/context2d/qquickcanvascontext.cpp items/context2d/qquickcanvascontext_p.h
items/context2d/qquickcanvasitem.cpp items/context2d/qquickcanvasitem_p.h
@@ -576,12 +576,12 @@ extend_target(Quick CONDITION QT_FEATURE_quick_canvas
items/context2d/qquickcontext2dtile.cpp items/context2d/qquickcontext2dtile_p.h
)
-extend_target(Quick CONDITION QT_FEATURE_wheelevent
+qt_extend_target(Quick CONDITION QT_FEATURE_wheelevent
SOURCES
handlers/qquickwheelhandler.cpp handlers/qquickwheelhandler_p.h
handlers/qquickwheelhandler_p_p.h
)
-add_qt_docs(Quick
+qt_add_docs(Quick
doc/qtquick.qdocconf
)
diff --git a/src/quickshapes/CMakeLists.txt b/src/quickshapes/CMakeLists.txt
index 04dda812d0..0150c49161 100644
--- a/src/quickshapes/CMakeLists.txt
+++ b/src/quickshapes/CMakeLists.txt
@@ -4,7 +4,7 @@
## QuickShapes Module:
#####################################################################
-add_qt_module(QuickShapes
+qt_add_module(QuickShapes
INTERNAL_MODULE
SOURCES
qquickshape.cpp qquickshape_p.h
@@ -48,7 +48,7 @@ set(qtquickshapes_resource_files
"shaders_ng/radialgradient.vert.qsb"
)
-add_qt_resource(QuickShapes "qtquickshapes"
+qt_add_resource(QuickShapes "qtquickshapes"
PREFIX
"/qt-project.org/shapes"
FILES
@@ -59,7 +59,7 @@ add_qt_resource(QuickShapes "qtquickshapes"
## Scopes:
#####################################################################
-extend_target(QuickShapes CONDITION QT_FEATURE_opengl
+qt_extend_target(QuickShapes CONDITION QT_FEATURE_opengl
SOURCES
qquicknvprfunctions.cpp qquicknvprfunctions_p.h
qquicknvprfunctions_p_p.h
diff --git a/src/quickwidgets/CMakeLists.txt b/src/quickwidgets/CMakeLists.txt
index e39477020e..113e7cc71f 100644
--- a/src/quickwidgets/CMakeLists.txt
+++ b/src/quickwidgets/CMakeLists.txt
@@ -4,7 +4,7 @@
## QuickWidgets Module:
#####################################################################
-add_qt_module(QuickWidgets
+qt_add_module(QuickWidgets
SOURCES
qquickwidget.cpp qquickwidget.h qquickwidget_p.h
qtquickwidgetsglobal.h
diff --git a/tests/auto/particles/qquickage/CMakeLists.txt b/tests/auto/particles/qquickage/CMakeLists.txt
index 9dfec05256..c808e2413f 100644
--- a/tests/auto/particles/qquickage/CMakeLists.txt
+++ b/tests/auto/particles/qquickage/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickage
+qt_add_test(tst_qquickage
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickage.cpp
@@ -33,12 +33,12 @@ add_qt_test(tst_qquickage
## Scopes:
#####################################################################
-extend_target(tst_qquickage CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickage CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickage CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickage CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/particles/qquickangleddirection/CMakeLists.txt b/tests/auto/particles/qquickangleddirection/CMakeLists.txt
index aa31081b37..3219ed9a36 100644
--- a/tests/auto/particles/qquickangleddirection/CMakeLists.txt
+++ b/tests/auto/particles/qquickangleddirection/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickangleddirection
+qt_add_test(tst_qquickangleddirection
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickangleddirection.cpp
@@ -33,12 +33,12 @@ add_qt_test(tst_qquickangleddirection
## Scopes:
#####################################################################
-extend_target(tst_qquickangleddirection CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickangleddirection CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickangleddirection CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickangleddirection CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt b/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt
index baf55ff930..41b1e242cb 100644
--- a/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt
+++ b/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickcumulativedirection
+qt_add_test(tst_qquickcumulativedirection
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickcumulativedirection.cpp
@@ -33,12 +33,12 @@ add_qt_test(tst_qquickcumulativedirection
## Scopes:
#####################################################################
-extend_target(tst_qquickcumulativedirection CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickcumulativedirection CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickcumulativedirection CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickcumulativedirection CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/particles/qquickcustomaffector/CMakeLists.txt b/tests/auto/particles/qquickcustomaffector/CMakeLists.txt
index dd37fc9599..dfd8617c64 100644
--- a/tests/auto/particles/qquickcustomaffector/CMakeLists.txt
+++ b/tests/auto/particles/qquickcustomaffector/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickcustomaffector
+qt_add_test(tst_qquickcustomaffector
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickcustomaffector.cpp
@@ -33,12 +33,12 @@ add_qt_test(tst_qquickcustomaffector
## Scopes:
#####################################################################
-extend_target(tst_qquickcustomaffector CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickcustomaffector CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickcustomaffector CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickcustomaffector CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/particles/qquickcustomparticle/CMakeLists.txt b/tests/auto/particles/qquickcustomparticle/CMakeLists.txt
index 6df41b08bd..6536b4f829 100644
--- a/tests/auto/particles/qquickcustomparticle/CMakeLists.txt
+++ b/tests/auto/particles/qquickcustomparticle/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickcustomparticle
+qt_add_test(tst_qquickcustomparticle
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickcustomparticle.cpp
@@ -33,12 +33,12 @@ add_qt_test(tst_qquickcustomparticle
## Scopes:
#####################################################################
-extend_target(tst_qquickcustomparticle CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickcustomparticle CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickcustomparticle CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickcustomparticle CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/particles/qquickellipseextruder/CMakeLists.txt b/tests/auto/particles/qquickellipseextruder/CMakeLists.txt
index ffa8751587..fc4d50557b 100644
--- a/tests/auto/particles/qquickellipseextruder/CMakeLists.txt
+++ b/tests/auto/particles/qquickellipseextruder/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickellipseextruder
+qt_add_test(tst_qquickellipseextruder
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickellipseextruder.cpp
@@ -33,12 +33,12 @@ add_qt_test(tst_qquickellipseextruder
## Scopes:
#####################################################################
-extend_target(tst_qquickellipseextruder CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickellipseextruder CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickellipseextruder CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickellipseextruder CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/particles/qquickfriction/CMakeLists.txt b/tests/auto/particles/qquickfriction/CMakeLists.txt
index e404d91591..7a2ea204c5 100644
--- a/tests/auto/particles/qquickfriction/CMakeLists.txt
+++ b/tests/auto/particles/qquickfriction/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickfriction
+qt_add_test(tst_qquickfriction
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickfriction.cpp
@@ -33,12 +33,12 @@ add_qt_test(tst_qquickfriction
## Scopes:
#####################################################################
-extend_target(tst_qquickfriction CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickfriction CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickfriction CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickfriction CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/particles/qquickgravity/CMakeLists.txt b/tests/auto/particles/qquickgravity/CMakeLists.txt
index 4afb097e17..4bb20de8c6 100644
--- a/tests/auto/particles/qquickgravity/CMakeLists.txt
+++ b/tests/auto/particles/qquickgravity/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickgravity
+qt_add_test(tst_qquickgravity
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickgravity.cpp
@@ -33,12 +33,12 @@ add_qt_test(tst_qquickgravity
## Scopes:
#####################################################################
-extend_target(tst_qquickgravity CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickgravity CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickgravity CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickgravity CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/particles/qquickgroupgoal/CMakeLists.txt b/tests/auto/particles/qquickgroupgoal/CMakeLists.txt
index 9fb39223dd..9f764f15c0 100644
--- a/tests/auto/particles/qquickgroupgoal/CMakeLists.txt
+++ b/tests/auto/particles/qquickgroupgoal/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickgroupgoal
+qt_add_test(tst_qquickgroupgoal
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickgroupgoal.cpp
@@ -33,12 +33,12 @@ add_qt_test(tst_qquickgroupgoal
## Scopes:
#####################################################################
-extend_target(tst_qquickgroupgoal CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickgroupgoal CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickgroupgoal CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickgroupgoal CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/particles/qquickimageparticle/CMakeLists.txt b/tests/auto/particles/qquickimageparticle/CMakeLists.txt
index c46568e32e..f897651ef3 100644
--- a/tests/auto/particles/qquickimageparticle/CMakeLists.txt
+++ b/tests/auto/particles/qquickimageparticle/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickimageparticle
+qt_add_test(tst_qquickimageparticle
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickimageparticle.cpp
@@ -33,12 +33,12 @@ add_qt_test(tst_qquickimageparticle
## Scopes:
#####################################################################
-extend_target(tst_qquickimageparticle CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickimageparticle CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickimageparticle CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickimageparticle CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/particles/qquickitemparticle/CMakeLists.txt b/tests/auto/particles/qquickitemparticle/CMakeLists.txt
index c0db633f17..0595f1506e 100644
--- a/tests/auto/particles/qquickitemparticle/CMakeLists.txt
+++ b/tests/auto/particles/qquickitemparticle/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickitemparticle
+qt_add_test(tst_qquickitemparticle
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickitemparticle.cpp
@@ -33,12 +33,12 @@ add_qt_test(tst_qquickitemparticle
## Scopes:
#####################################################################
-extend_target(tst_qquickitemparticle CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickitemparticle CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickitemparticle CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickitemparticle CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/particles/qquicklineextruder/CMakeLists.txt b/tests/auto/particles/qquicklineextruder/CMakeLists.txt
index 3178315d90..614a175ed5 100644
--- a/tests/auto/particles/qquicklineextruder/CMakeLists.txt
+++ b/tests/auto/particles/qquicklineextruder/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquicklineextruder
+qt_add_test(tst_qquicklineextruder
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquicklineextruder.cpp
@@ -33,12 +33,12 @@ add_qt_test(tst_qquicklineextruder
## Scopes:
#####################################################################
-extend_target(tst_qquicklineextruder CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquicklineextruder CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquicklineextruder CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquicklineextruder CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/particles/qquickmaskextruder/CMakeLists.txt b/tests/auto/particles/qquickmaskextruder/CMakeLists.txt
index ea9ec81666..bb96097806 100644
--- a/tests/auto/particles/qquickmaskextruder/CMakeLists.txt
+++ b/tests/auto/particles/qquickmaskextruder/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickmaskextruder
+qt_add_test(tst_qquickmaskextruder
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickmaskextruder.cpp
@@ -33,12 +33,12 @@ add_qt_test(tst_qquickmaskextruder
## Scopes:
#####################################################################
-extend_target(tst_qquickmaskextruder CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickmaskextruder CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickmaskextruder CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickmaskextruder CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/particles/qquickparticlegroup/CMakeLists.txt b/tests/auto/particles/qquickparticlegroup/CMakeLists.txt
index 469a070192..0ce6e17f5e 100644
--- a/tests/auto/particles/qquickparticlegroup/CMakeLists.txt
+++ b/tests/auto/particles/qquickparticlegroup/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickparticlegroup
+qt_add_test(tst_qquickparticlegroup
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickparticlegroup.cpp
@@ -33,12 +33,12 @@ add_qt_test(tst_qquickparticlegroup
## Scopes:
#####################################################################
-extend_target(tst_qquickparticlegroup CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickparticlegroup CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickparticlegroup CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickparticlegroup CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/particles/qquickparticlesystem/CMakeLists.txt b/tests/auto/particles/qquickparticlesystem/CMakeLists.txt
index 30ba359ccd..10d42f8674 100644
--- a/tests/auto/particles/qquickparticlesystem/CMakeLists.txt
+++ b/tests/auto/particles/qquickparticlesystem/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickparticlesystem
+qt_add_test(tst_qquickparticlesystem
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickparticlesystem.cpp
@@ -33,12 +33,12 @@ add_qt_test(tst_qquickparticlesystem
## Scopes:
#####################################################################
-extend_target(tst_qquickparticlesystem CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickparticlesystem CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickparticlesystem CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickparticlesystem CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/particles/qquickpointattractor/CMakeLists.txt b/tests/auto/particles/qquickpointattractor/CMakeLists.txt
index 0dd60223ec..6590136bd7 100644
--- a/tests/auto/particles/qquickpointattractor/CMakeLists.txt
+++ b/tests/auto/particles/qquickpointattractor/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickpointattractor
+qt_add_test(tst_qquickpointattractor
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickpointattractor.cpp
@@ -33,12 +33,12 @@ add_qt_test(tst_qquickpointattractor
## Scopes:
#####################################################################
-extend_target(tst_qquickpointattractor CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickpointattractor CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickpointattractor CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickpointattractor CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/particles/qquickpointdirection/CMakeLists.txt b/tests/auto/particles/qquickpointdirection/CMakeLists.txt
index 128e6a202b..f12c22d721 100644
--- a/tests/auto/particles/qquickpointdirection/CMakeLists.txt
+++ b/tests/auto/particles/qquickpointdirection/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickpointdirection
+qt_add_test(tst_qquickpointdirection
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickpointdirection.cpp
@@ -33,12 +33,12 @@ add_qt_test(tst_qquickpointdirection
## Scopes:
#####################################################################
-extend_target(tst_qquickpointdirection CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickpointdirection CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickpointdirection CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickpointdirection CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt b/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt
index 8b180893e8..9cfa12c01e 100644
--- a/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt
+++ b/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickrectangleextruder
+qt_add_test(tst_qquickrectangleextruder
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickrectangleextruder.cpp
@@ -33,12 +33,12 @@ add_qt_test(tst_qquickrectangleextruder
## Scopes:
#####################################################################
-extend_target(tst_qquickrectangleextruder CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickrectangleextruder CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickrectangleextruder CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickrectangleextruder CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/particles/qquickspritegoal/CMakeLists.txt b/tests/auto/particles/qquickspritegoal/CMakeLists.txt
index ee298e96fb..ea9776111e 100644
--- a/tests/auto/particles/qquickspritegoal/CMakeLists.txt
+++ b/tests/auto/particles/qquickspritegoal/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickspritegoal
+qt_add_test(tst_qquickspritegoal
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickspritegoal.cpp
@@ -33,12 +33,12 @@ add_qt_test(tst_qquickspritegoal
## Scopes:
#####################################################################
-extend_target(tst_qquickspritegoal CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickspritegoal CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickspritegoal CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickspritegoal CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/particles/qquicktargetdirection/CMakeLists.txt b/tests/auto/particles/qquicktargetdirection/CMakeLists.txt
index e167d487dc..a98bd886be 100644
--- a/tests/auto/particles/qquicktargetdirection/CMakeLists.txt
+++ b/tests/auto/particles/qquicktargetdirection/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquicktargetdirection
+qt_add_test(tst_qquicktargetdirection
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquicktargetdirection.cpp
@@ -33,12 +33,12 @@ add_qt_test(tst_qquicktargetdirection
## Scopes:
#####################################################################
-extend_target(tst_qquicktargetdirection CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquicktargetdirection CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquicktargetdirection CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquicktargetdirection CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/particles/qquicktrailemitter/CMakeLists.txt b/tests/auto/particles/qquicktrailemitter/CMakeLists.txt
index 2ae5c0a108..c117228445 100644
--- a/tests/auto/particles/qquicktrailemitter/CMakeLists.txt
+++ b/tests/auto/particles/qquicktrailemitter/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquicktrailemitter
+qt_add_test(tst_qquicktrailemitter
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquicktrailemitter.cpp
@@ -33,12 +33,12 @@ add_qt_test(tst_qquicktrailemitter
## Scopes:
#####################################################################
-extend_target(tst_qquicktrailemitter CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquicktrailemitter CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquicktrailemitter CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquicktrailemitter CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/particles/qquickturbulence/CMakeLists.txt b/tests/auto/particles/qquickturbulence/CMakeLists.txt
index 9409f54053..72e6e3b621 100644
--- a/tests/auto/particles/qquickturbulence/CMakeLists.txt
+++ b/tests/auto/particles/qquickturbulence/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickturbulence
+qt_add_test(tst_qquickturbulence
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickturbulence.cpp
@@ -33,12 +33,12 @@ add_qt_test(tst_qquickturbulence
## Scopes:
#####################################################################
-extend_target(tst_qquickturbulence CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickturbulence CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickturbulence CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickturbulence CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/particles/qquickwander/CMakeLists.txt b/tests/auto/particles/qquickwander/CMakeLists.txt
index 440afb7d4d..a747ae7227 100644
--- a/tests/auto/particles/qquickwander/CMakeLists.txt
+++ b/tests/auto/particles/qquickwander/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickwander
+qt_add_test(tst_qquickwander
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickwander.cpp
@@ -33,12 +33,12 @@ add_qt_test(tst_qquickwander
## Scopes:
#####################################################################
-extend_target(tst_qquickwander CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickwander CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickwander CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickwander CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/animation/qabstractanimationjob/CMakeLists.txt b/tests/auto/qml/animation/qabstractanimationjob/CMakeLists.txt
index 36b6c071dc..f6b8b2aa69 100644
--- a/tests/auto/qml/animation/qabstractanimationjob/CMakeLists.txt
+++ b/tests/auto/qml/animation/qabstractanimationjob/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qabstractanimationjob Test:
#####################################################################
-add_qt_test(tst_qabstractanimationjob
+qt_add_test(tst_qabstractanimationjob
SOURCES
tst_qabstractanimationjob.cpp
LIBRARIES
diff --git a/tests/auto/qml/animation/qanimationgroupjob/CMakeLists.txt b/tests/auto/qml/animation/qanimationgroupjob/CMakeLists.txt
index c51fb2e754..d62512b489 100644
--- a/tests/auto/qml/animation/qanimationgroupjob/CMakeLists.txt
+++ b/tests/auto/qml/animation/qanimationgroupjob/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qanimationgroupjob Test:
#####################################################################
-add_qt_test(tst_qanimationgroupjob
+qt_add_test(tst_qanimationgroupjob
SOURCES
tst_qanimationgroupjob.cpp
LIBRARIES
diff --git a/tests/auto/qml/animation/qparallelanimationgroupjob/CMakeLists.txt b/tests/auto/qml/animation/qparallelanimationgroupjob/CMakeLists.txt
index 2b73283ad5..02fa824cd2 100644
--- a/tests/auto/qml/animation/qparallelanimationgroupjob/CMakeLists.txt
+++ b/tests/auto/qml/animation/qparallelanimationgroupjob/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qparallelanimationgroupjob Test:
#####################################################################
-add_qt_test(tst_qparallelanimationgroupjob
+qt_add_test(tst_qparallelanimationgroupjob
SOURCES
tst_qparallelanimationgroupjob.cpp
LIBRARIES
diff --git a/tests/auto/qml/animation/qpauseanimationjob/CMakeLists.txt b/tests/auto/qml/animation/qpauseanimationjob/CMakeLists.txt
index e5324af19d..e337d8aea9 100644
--- a/tests/auto/qml/animation/qpauseanimationjob/CMakeLists.txt
+++ b/tests/auto/qml/animation/qpauseanimationjob/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qpauseanimationjob Test:
#####################################################################
-add_qt_test(tst_qpauseanimationjob
+qt_add_test(tst_qpauseanimationjob
SOURCES
tst_qpauseanimationjob.cpp
LIBRARIES
diff --git a/tests/auto/qml/animation/qsequentialanimationgroupjob/CMakeLists.txt b/tests/auto/qml/animation/qsequentialanimationgroupjob/CMakeLists.txt
index 7240f53dea..925f0c618b 100644
--- a/tests/auto/qml/animation/qsequentialanimationgroupjob/CMakeLists.txt
+++ b/tests/auto/qml/animation/qsequentialanimationgroupjob/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qsequentialanimationgroupjob Test:
#####################################################################
-add_qt_test(tst_qsequentialanimationgroupjob
+qt_add_test(tst_qsequentialanimationgroupjob
SOURCES
tst_qsequentialanimationgroupjob.cpp
LIBRARIES
diff --git a/tests/auto/qml/bindingdependencyapi/CMakeLists.txt b/tests/auto/qml/bindingdependencyapi/CMakeLists.txt
index b214d50b7c..3f44aa3c0e 100644
--- a/tests/auto/qml/bindingdependencyapi/CMakeLists.txt
+++ b/tests/auto/qml/bindingdependencyapi/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_bindingdependencyapi
+qt_add_test(tst_bindingdependencyapi
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_bindingdependencyapi.cpp
@@ -31,12 +31,12 @@ add_qt_test(tst_bindingdependencyapi
## Scopes:
#####################################################################
-extend_target(tst_bindingdependencyapi CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_bindingdependencyapi CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_bindingdependencyapi CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_bindingdependencyapi CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt b/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt
index 343d75058f..1a28e73cea 100644
--- a/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qdebugmessageservice
+qt_add_test(tst_qdebugmessageservice
SOURCES
../../../shared/util.cpp ../../../shared/util.h
../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -36,12 +36,12 @@ add_qt_test(tst_qdebugmessageservice
## Scopes:
#####################################################################
-extend_target(tst_qdebugmessageservice CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qdebugmessageservice CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qdebugmessageservice CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qdebugmessageservice CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt b/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt
index d162ebc572..89e7b098bd 100644
--- a/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qpacketprotocol Test:
#####################################################################
-add_qt_test(tst_qpacketprotocol
+qt_add_test(tst_qpacketprotocol
SOURCES
../../../shared/util.cpp ../../../shared/util.h
../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -26,12 +26,12 @@ add_qt_test(tst_qpacketprotocol
## Scopes:
#####################################################################
-extend_target(tst_qpacketprotocol CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qpacketprotocol CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qpacketprotocol CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qpacketprotocol CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt
index 76e0a404f3..578bc9bd21 100644
--- a/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qqmldebugclient Test:
#####################################################################
-add_qt_test(tst_qqmldebugclient
+qt_add_test(tst_qqmldebugclient
SOURCES
../../../shared/util.cpp ../../../shared/util.h
../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -31,12 +31,12 @@ add_qt_test(tst_qqmldebugclient
## Scopes:
#####################################################################
-extend_target(tst_qqmldebugclient CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmldebugclient CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmldebugclient CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmldebugclient CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt
index 8e26af3cd0..c90cc0e9de 100644
--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qqmldebuggingenabler Test:
#####################################################################
-add_qt_test(tst_qqmldebuggingenabler
+qt_add_test(tst_qqmldebuggingenabler
SOURCES
../../../../shared/util.cpp ../../../../shared/util.h
../../shared/debugutil.cpp ../../shared/debugutil_p.h
@@ -29,12 +29,12 @@ add_qt_test(tst_qqmldebuggingenabler
## Scopes:
#####################################################################
-extend_target(tst_qqmldebuggingenabler CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmldebuggingenabler CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmldebuggingenabler CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmldebuggingenabler CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/.prev_CMakeLists.txt b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/.prev_CMakeLists.txt
index d5b3277b82..818e639fb5 100644
--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/.prev_CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## qqmldebuggingenablerserver Binary:
#####################################################################
-add_qt_executable(qqmldebuggingenablerserver
+qt_add_executable(qqmldebuggingenablerserver
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qqmldebuggingenabler"
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qqmldebuggingenabler"
SOURCES
diff --git a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/CMakeLists.txt
index 070c2a78bf..16dfb7b494 100644
--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/CMakeLists.txt
@@ -4,7 +4,7 @@
## qqmldebuggingenablerserver Binary:
#####################################################################
-add_qt_executable(qqmldebuggingenablerserver
+qt_add_executable(qqmldebuggingenablerserver
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qqmldebuggingenabler"
# special case begin
# Remove INSTALL_DIRECTORY with $$[QT_INSTALL_TESTS]
diff --git a/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt
index b20af4731b..4f9777eeba 100644
--- a/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmldebugjs
+qt_add_test(tst_qqmldebugjs
SOURCES
../../../shared/util.cpp ../../../shared/util.h
../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -35,12 +35,12 @@ add_qt_test(tst_qqmldebugjs
## Scopes:
#####################################################################
-extend_target(tst_qqmldebugjs CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmldebugjs CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmldebugjs CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmldebugjs CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/debugger/qqmldebugjsserver/.prev_CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugjsserver/.prev_CMakeLists.txt
index c7cbb71db7..7d82431f5d 100644
--- a/tests/auto/qml/debugger/qqmldebugjsserver/.prev_CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugjsserver/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## qqmldebugjsserver Binary:
#####################################################################
-add_qt_executable(qqmldebugjsserver
+qt_add_executable(qqmldebugjsserver
OUTPUT_DIRECTORY "${INSTALL_TESTSDIR}/qqmldebugjsserver"
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/qqmldebugjsserver"
SOURCES
diff --git a/tests/auto/qml/debugger/qqmldebugjsserver/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugjsserver/CMakeLists.txt
index 85a682ff93..605ad3562e 100644
--- a/tests/auto/qml/debugger/qqmldebugjsserver/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugjsserver/CMakeLists.txt
@@ -4,7 +4,7 @@
## qqmldebugjsserver Binary:
#####################################################################
-add_qt_executable(qqmldebugjsserver
+qt_add_executable(qqmldebugjsserver
# special case begin
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
# INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/qqmldebugjsserver"
diff --git a/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt
index 27c968b5bb..791ea18adb 100644
--- a/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qqmldebuglocal Test:
#####################################################################
-add_qt_test(tst_qqmldebuglocal
+qt_add_test(tst_qqmldebuglocal
SOURCES
../../../shared/util.cpp ../../../shared/util.h
../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -30,12 +30,12 @@ add_qt_test(tst_qqmldebuglocal
## Scopes:
#####################################################################
-extend_target(tst_qqmldebuglocal CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmldebuglocal CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmldebuglocal CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmldebuglocal CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess/CMakeLists.txt
index bfa8ec10d3..a98a809c7b 100644
--- a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qqmldebugprocess Test:
#####################################################################
-add_qt_test(tst_qqmldebugprocess
+qt_add_test(tst_qqmldebugprocess
SOURCES
../../shared/qqmldebugprocess.cpp ../../shared/qqmldebugprocess_p.h
tst_qqmldebugprocess.cpp
diff --git a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/.prev_CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/.prev_CMakeLists.txt
index 0f39b6c1c3..f5b04b18b5 100644
--- a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/.prev_CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## qqmldebugprocessprocess Binary:
#####################################################################
-add_qt_executable(qqmldebugprocessprocess
+qt_add_executable(qqmldebugprocessprocess
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qqmldebugprocess"
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qqmldebugprocess"
SOURCES
diff --git a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/CMakeLists.txt
index c6e2aedb78..35e602d4f9 100644
--- a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/CMakeLists.txt
@@ -4,7 +4,7 @@
## qqmldebugprocessprocess Binary:
#####################################################################
-add_qt_executable(qqmldebugprocessprocess
+qt_add_executable(qqmldebugprocessprocess
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qqmldebugprocess"
# special case begin
# Remove INSTALL_DIRECTORY which starts with
diff --git a/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt
index b203440f1a..9b369053cc 100644
--- a/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmldebugservice
+qt_add_test(tst_qqmldebugservice
SOURCES
../../../shared/util.cpp ../../../shared/util.h
../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -40,12 +40,12 @@ add_qt_test(tst_qqmldebugservice
## Scopes:
#####################################################################
-extend_target(tst_qqmldebugservice CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmldebugservice CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmldebugservice CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmldebugservice CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt b/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt
index bf90555c47..a0f76b270a 100644
--- a/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlenginecontrol
+qt_add_test(tst_qqmlenginecontrol
SOURCES
../../../shared/util.cpp ../../../shared/util.h
../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -35,12 +35,12 @@ add_qt_test(tst_qqmlenginecontrol
## Scopes:
#####################################################################
-extend_target(tst_qqmlenginecontrol CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlenginecontrol CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlenginecontrol CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlenginecontrol CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt
index b4d382bb37..b8c377a268 100644
--- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlenginedebuginspectorintegration
+qt_add_test(tst_qqmlenginedebuginspectorintegration
SOURCES
../../../shared/util.cpp ../../../shared/util.h
../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -32,12 +32,12 @@ add_qt_test(tst_qqmlenginedebuginspectorintegration
## Scopes:
#####################################################################
-extend_target(tst_qqmlenginedebuginspectorintegration CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlenginedebuginspectorintegration CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlenginedebuginspectorintegration CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlenginedebuginspectorintegration CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt
index 128ac8d0cb..6e54b5c7f5 100644
--- a/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qqmlenginedebugservice Test:
#####################################################################
-add_qt_test(tst_qqmlenginedebugservice
+qt_add_test(tst_qqmlenginedebugservice
SOURCES
../../../shared/util.cpp ../../../shared/util.h
../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -28,12 +28,12 @@ add_qt_test(tst_qqmlenginedebugservice
## Scopes:
#####################################################################
-extend_target(tst_qqmlenginedebugservice CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlenginedebugservice CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlenginedebugservice CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlenginedebugservice CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt b/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt
index 5220a77d41..822f59a2cb 100644
--- a/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlinspector
+qt_add_test(tst_qqmlinspector
SOURCES
../../../shared/util.cpp ../../../shared/util.h
../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -32,12 +32,12 @@ add_qt_test(tst_qqmlinspector
## Scopes:
#####################################################################
-extend_target(tst_qqmlinspector CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlinspector CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlinspector CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlinspector CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt b/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt
index 86722a769c..c818c158dc 100644
--- a/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qqmlnativeconnector Test:
#####################################################################
-add_qt_test(tst_qqmlnativeconnector
+qt_add_test(tst_qqmlnativeconnector
SOURCES
tst_qqmlnativeconnector.cpp
DEFINES
diff --git a/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt b/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt
index 4f2e3aafde..1d31348b6d 100644
--- a/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND test_data "data/broken.qml")
list(APPEND test_data "data/zoom.qml")
list(APPEND test_data "data/i18n/qml_fr_FR.qm")
-add_qt_test(tst_qqmlpreview
+qt_add_test(tst_qqmlpreview
SOURCES
../../../../../src/plugins/qmltooling/qmldbg_preview/qqmlpreviewblacklist.cpp ../../../../../src/plugins/qmltooling/qmldbg_preview/qqmlpreviewblacklist.h
../../../shared/util.cpp ../../../shared/util.h
@@ -36,12 +36,12 @@ add_qt_test(tst_qqmlpreview
## Scopes:
#####################################################################
-extend_target(tst_qqmlpreview CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlpreview CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlpreview CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlpreview CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt
index 8e5af6d4e7..c1c588b798 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlprofilerservice
+qt_add_test(tst_qqmlprofilerservice
SOURCES
../../../shared/util.cpp ../../../shared/util.h
../shared/debugutil.cpp ../shared/debugutil_p.h
@@ -34,12 +34,12 @@ add_qt_test(tst_qqmlprofilerservice
## Scopes:
#####################################################################
-extend_target(tst_qqmlprofilerservice CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlprofilerservice CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlprofilerservice CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlprofilerservice CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt b/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt
index 9238e3c402..61ba310c9e 100644
--- a/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt
+++ b/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qv4debugger Test:
#####################################################################
-add_qt_test(tst_qv4debugger
+qt_add_test(tst_qv4debugger
SOURCES
../../../../../src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp ../../../../../src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.h
../../../../../src/plugins/qmltooling/qmldbg_debugger/qv4debugger.cpp ../../../../../src/plugins/qmltooling/qmldbg_debugger/qv4debugger.h
diff --git a/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt b/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt
index c3b23fb30d..5ec6cb6257 100644
--- a/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt
+++ b/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt
@@ -4,7 +4,7 @@
## qjstest Tool:
#####################################################################
-add_qt_tool(qjstest
+qt_add_tool(qjstest
SOURCES
main.cpp
test262runner.cpp test262runner.h
diff --git a/tests/auto/qml/parserstress/CMakeLists.txt b/tests/auto/qml/parserstress/CMakeLists.txt
index bf739790db..bbd29fa6a5 100644
--- a/tests/auto/qml/parserstress/CMakeLists.txt
+++ b/tests/auto/qml/parserstress/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
tests/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_parserstress
+qt_add_test(tst_parserstress
SOURCES
tst_parserstress.cpp
LIBRARIES
diff --git a/tests/auto/qml/qjsengine/CMakeLists.txt b/tests/auto/qml/qjsengine/CMakeLists.txt
index f3534f59dd..8e406e92ca 100644
--- a/tests/auto/qml/qjsengine/CMakeLists.txt
+++ b/tests/auto/qml/qjsengine/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
script/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qjsengine
+qt_add_test(tst_qjsengine
SOURCES
tst_qjsengine.cpp
LIBRARIES
@@ -31,7 +31,7 @@ set(qjsengine_resource_files
"translations/translatable_la.qm"
)
-add_qt_resource(tst_qjsengine "qjsengine"
+qt_add_resource(tst_qjsengine "qjsengine"
PREFIX
"/"
FILES
@@ -44,7 +44,7 @@ set(qmake_immediate_resource_files
"testmodule.mjs"
)
-add_qt_resource(tst_qjsengine "qmake_immediate"
+qt_add_resource(tst_qjsengine "qmake_immediate"
PREFIX
"/"
FILES
diff --git a/tests/auto/qml/qjsonbinding/CMakeLists.txt b/tests/auto/qml/qjsonbinding/CMakeLists.txt
index bdd272fc30..ef9612d5db 100644
--- a/tests/auto/qml/qjsonbinding/CMakeLists.txt
+++ b/tests/auto/qml/qjsonbinding/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qjsonbinding
+qt_add_test(tst_qjsonbinding
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qjsonbinding.cpp
@@ -27,12 +27,12 @@ add_qt_test(tst_qjsonbinding
## Scopes:
#####################################################################
-extend_target(tst_qjsonbinding CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qjsonbinding CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qjsonbinding CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qjsonbinding CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qjsvalue/CMakeLists.txt b/tests/auto/qml/qjsvalue/CMakeLists.txt
index 7f3b749aa4..43f4a0d543 100644
--- a/tests/auto/qml/qjsvalue/CMakeLists.txt
+++ b/tests/auto/qml/qjsvalue/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qjsvalue Test:
#####################################################################
-add_qt_test(tst_qjsvalue
+qt_add_test(tst_qjsvalue
SOURCES
tst_qjsvalue.cpp tst_qjsvalue.h
LIBRARIES
diff --git a/tests/auto/qml/qjsvalueiterator/CMakeLists.txt b/tests/auto/qml/qjsvalueiterator/CMakeLists.txt
index a347407f91..48edd77265 100644
--- a/tests/auto/qml/qjsvalueiterator/CMakeLists.txt
+++ b/tests/auto/qml/qjsvalueiterator/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qjsvalueiterator Test:
#####################################################################
-add_qt_test(tst_qjsvalueiterator
+qt_add_test(tst_qjsvalueiterator
SOURCES
tst_qjsvalueiterator.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/qml/qmlcachegen/CMakeLists.txt b/tests/auto/qml/qmlcachegen/CMakeLists.txt
index 7d61ab5893..fcd4be8633 100644
--- a/tests/auto/qml/qmlcachegen/CMakeLists.txt
+++ b/tests/auto/qml/qmlcachegen/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qmlcachegen
+qt_add_test(tst_qmlcachegen
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qmlcachegen.cpp
@@ -31,7 +31,7 @@ set(qmake_workerscripts_test_resource_files
"data/worker.qml"
)
-add_qt_resource(tst_qmlcachegen "qmake_workerscripts_test"
+qt_add_resource(tst_qmlcachegen "qmake_workerscripts_test"
PREFIX
"/workerscripts"
FILES
@@ -52,7 +52,7 @@ set(trickypaths_resource_files
"data/versionStyleSuffix-1.2-more.qml"
)
-add_qt_resource(tst_qmlcachegen "trickypaths"
+qt_add_resource(tst_qmlcachegen "trickypaths"
PREFIX
"/directory with spaces"
FILES
@@ -65,7 +65,7 @@ set(retain_resource_files
"Retain.qml"
)
-add_qt_resource(tst_qmlcachegen "retain"
+qt_add_resource(tst_qmlcachegen "retain"
PREFIX
"/"
BASE
@@ -86,7 +86,7 @@ set(qmake_immediate_resource_files
"data/versionchecks.qml"
)
-add_qt_resource(tst_qmlcachegen "qmake_immediate"
+qt_add_resource(tst_qmlcachegen "qmake_immediate"
PREFIX
"/"
FILES
@@ -106,7 +106,7 @@ if(UNIX)
"data/umlaut.qml"
)
- add_qt_resource(tst_qmlcachegen "trickypaths_umlaut"
+ qt_add_resource(tst_qmlcachegen "trickypaths_umlaut"
PREFIX
"/"
FILES
@@ -114,12 +114,12 @@ if(UNIX)
)
endif()
-extend_target(tst_qmlcachegen CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qmlcachegen CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qmlcachegen CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qmlcachegen CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qmldiskcache/.prev_CMakeLists.txt b/tests/auto/qml/qmldiskcache/.prev_CMakeLists.txt
index 927aa9f558..47bd9f64cd 100644
--- a/tests/auto/qml/qmldiskcache/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qmldiskcache/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qmldiskcache Test:
#####################################################################
-add_qt_test(tst_qmldiskcache
+qt_add_test(tst_qmldiskcache
SOURCES
tst_qmldiskcache.cpp
LIBRARIES
@@ -22,7 +22,7 @@ set(qmake_immediate_resource_files
"test.qml"
)
-add_qt_resource(tst_qmldiskcache "qmake_immediate"
+qt_add_resource(tst_qmldiskcache "qmake_immediate"
PREFIX
"/"
FILES
diff --git a/tests/auto/qml/qmldiskcache/CMakeLists.txt b/tests/auto/qml/qmldiskcache/CMakeLists.txt
index 30019a8da8..2d46117815 100644
--- a/tests/auto/qml/qmldiskcache/CMakeLists.txt
+++ b/tests/auto/qml/qmldiskcache/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qmldiskcache Test:
#####################################################################
-add_qt_test(tst_qmldiskcache
+qt_add_test(tst_qmldiskcache
SOURCES
tst_qmldiskcache.cpp
LIBRARIES
@@ -33,7 +33,7 @@ set(qmake_immediate_resource_files
"test.qml"
)
-add_qt_resource(tst_qmldiskcache "qmake_immediate"
+qt_add_resource(tst_qmldiskcache "qmake_immediate"
PREFIX
"/"
FILES
diff --git a/tests/auto/qml/qmllint/CMakeLists.txt b/tests/auto/qml/qmllint/CMakeLists.txt
index a4bc65a0da..a6d1ada7ad 100644
--- a/tests/auto/qml/qmllint/CMakeLists.txt
+++ b/tests/auto/qml/qmllint/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qmllint
+qt_add_test(tst_qmllint
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qmllint.cpp
@@ -24,12 +24,12 @@ add_qt_test(tst_qmllint
## Scopes:
#####################################################################
-extend_target(tst_qmllint CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qmllint CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qmllint CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qmllint CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qmlmin/CMakeLists.txt b/tests/auto/qml/qmlmin/CMakeLists.txt
index 76bba7e42f..b1a8037cca 100644
--- a/tests/auto/qml/qmlmin/CMakeLists.txt
+++ b/tests/auto/qml/qmlmin/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qmlmin Test:
#####################################################################
-add_qt_test(tst_qmlmin
+qt_add_test(tst_qmlmin
SOURCES
tst_qmlmin.cpp
DEFINES
@@ -19,7 +19,7 @@ add_qt_test(tst_qmlmin
## Scopes:
#####################################################################
-extend_target(tst_qmlmin CONDITION cross_compile AND NOT boot2qt
+qt_extend_target(tst_qmlmin CONDITION cross_compile AND NOT boot2qt
DEFINES
QTEST_CROSS_COMPILED
)
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Dummy/.prev_CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Dummy/.prev_CMakeLists.txt
index e8b5fb59ff..e8f6a9f7b7 100644
--- a/tests/auto/qml/qmlplugindump/data/dumper/Dummy/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/data/dumper/Dummy/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## Dummy Generic Library:
#####################################################################
-add_cmake_library(Dummy
+qt_add_cmake_library(Dummy
MODULE
SOURCES
dummy.cpp dummy.h
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Dummy/CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Dummy/CMakeLists.txt
index 2278a7423f..933b3f152e 100644
--- a/tests/auto/qml/qmlplugindump/data/dumper/Dummy/CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/data/dumper/Dummy/CMakeLists.txt
@@ -4,7 +4,7 @@
## Dummy Generic Library:
#####################################################################
-add_cmake_library(Dummy
+qt_add_cmake_library(Dummy
MODULE
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/.prev_CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/.prev_CMakeLists.txt
index b56eac2165..993c3e19e6 100644
--- a/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## ExtendedType Generic Library:
#####################################################################
-add_cmake_library(ExtendedType
+qt_add_cmake_library(ExtendedType
MODULE
SOURCES
plugin.cpp plugin.h
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/CMakeLists.txt
index 11ac920aeb..9e934eff60 100644
--- a/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/data/dumper/ExtendedType/CMakeLists.txt
@@ -4,7 +4,7 @@
## ExtendedType Generic Library:
#####################################################################
-add_cmake_library(ExtendedType
+qt_add_cmake_library(ExtendedType
MODULE
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt
index 89079d0e0e..aeb3308336 100644
--- a/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## Imports Generic Library:
#####################################################################
-add_cmake_library(Imports
+qt_add_cmake_library(Imports
MODULE
SOURCES
imports.cpp imports.h
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt
index 611842f9a3..cf776a58ff 100644
--- a/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt
@@ -4,7 +4,7 @@
## Imports Generic Library:
#####################################################################
-add_cmake_library(Imports
+qt_add_cmake_library(Imports
MODULE
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Versions/.prev_CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Versions/.prev_CMakeLists.txt
index e29fe730f5..2edf46a96a 100644
--- a/tests/auto/qml/qmlplugindump/data/dumper/Versions/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/data/dumper/Versions/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## Versions Generic Library:
#####################################################################
-add_cmake_library(Versions
+qt_add_cmake_library(Versions
MODULE
SOURCES
versions.cpp versions.h
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Versions/CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Versions/CMakeLists.txt
index 3b3a6eb77b..950ffda821 100644
--- a/tests/auto/qml/qmlplugindump/data/dumper/Versions/CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/data/dumper/Versions/CMakeLists.txt
@@ -4,7 +4,7 @@
## Versions Generic Library:
#####################################################################
-add_cmake_library(Versions
+qt_add_cmake_library(Versions
MODULE
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES
diff --git a/tests/auto/qml/qqmlapplicationengine/testapp/CMakeLists.txt b/tests/auto/qml/qqmlapplicationengine/testapp/CMakeLists.txt
index 95a2659ec8..b97251f0b8 100644
--- a/tests/auto/qml/qqmlapplicationengine/testapp/CMakeLists.txt
+++ b/tests/auto/qml/qqmlapplicationengine/testapp/CMakeLists.txt
@@ -4,7 +4,7 @@
## testapp Binary:
#####################################################################
-add_qt_executable(testapp
+qt_add_executable(testapp
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
SOURCES
main.cpp
@@ -21,7 +21,7 @@ set(main_resource_files
"immediateQuit.qml"
)
-add_qt_resource(testapp "main"
+qt_add_resource(testapp "main"
PREFIX
"/"
FILES
diff --git a/tests/auto/qml/qqmlbinding/CMakeLists.txt b/tests/auto/qml/qqmlbinding/CMakeLists.txt
index 3ebbbd46b1..d4ac2e7dad 100644
--- a/tests/auto/qml/qqmlbinding/CMakeLists.txt
+++ b/tests/auto/qml/qqmlbinding/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlbinding
+qt_add_test(tst_qqmlbinding
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmlbinding.cpp
@@ -31,12 +31,12 @@ add_qt_test(tst_qqmlbinding
## Scopes:
#####################################################################
-extend_target(tst_qqmlbinding CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlbinding CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlbinding CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlbinding CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlchangeset/CMakeLists.txt b/tests/auto/qml/qqmlchangeset/CMakeLists.txt
index ad688cd556..c8da32eff8 100644
--- a/tests/auto/qml/qqmlchangeset/CMakeLists.txt
+++ b/tests/auto/qml/qqmlchangeset/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qqmlhangeset Test:
#####################################################################
-add_qt_test(tst_qqmlhangeset
+qt_add_test(tst_qqmlhangeset
SOURCES
tst_qqmlchangeset.cpp
LIBRARIES
diff --git a/tests/auto/qml/qqmlcomponent/CMakeLists.txt b/tests/auto/qml/qqmlcomponent/CMakeLists.txt
index 0ee7103dc6..41f844d369 100644
--- a/tests/auto/qml/qqmlcomponent/CMakeLists.txt
+++ b/tests/auto/qml/qqmlcomponent/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlcomponent
+qt_add_test(tst_qqmlcomponent
SOURCES
../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
../../shared/util.cpp ../../shared/util.h
@@ -35,7 +35,7 @@ set(qmake_immediate_resource_files
"data/QtObjectComponent.qml"
)
-add_qt_resource(tst_qqmlcomponent "qmake_immediate"
+qt_add_resource(tst_qqmlcomponent "qmake_immediate"
PREFIX
"/"
FILES
@@ -46,12 +46,12 @@ add_qt_resource(tst_qqmlcomponent "qmake_immediate"
## Scopes:
#####################################################################
-extend_target(tst_qqmlcomponent CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlcomponent CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlcomponent CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlcomponent CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlconnections/CMakeLists.txt b/tests/auto/qml/qqmlconnections/CMakeLists.txt
index 5874b19fbf..22f2a86278 100644
--- a/tests/auto/qml/qqmlconnections/CMakeLists.txt
+++ b/tests/auto/qml/qqmlconnections/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlconnections
+qt_add_test(tst_qqmlconnections
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmlconnections.cpp
@@ -31,12 +31,12 @@ add_qt_test(tst_qqmlconnections
## Scopes:
#####################################################################
-extend_target(tst_qqmlconnections CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlconnections CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlconnections CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlconnections CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlconsole/CMakeLists.txt b/tests/auto/qml/qqmlconsole/CMakeLists.txt
index dd9fea6721..25c726e8fd 100644
--- a/tests/auto/qml/qqmlconsole/CMakeLists.txt
+++ b/tests/auto/qml/qqmlconsole/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlconsole
+qt_add_test(tst_qqmlconsole
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmlconsole.cpp
@@ -27,12 +27,12 @@ add_qt_test(tst_qqmlconsole
## Scopes:
#####################################################################
-extend_target(tst_qqmlconsole CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlconsole CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlconsole CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlconsole CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlcontext/CMakeLists.txt b/tests/auto/qml/qqmlcontext/CMakeLists.txt
index 741bfec4c0..a3c08a67f7 100644
--- a/tests/auto/qml/qqmlcontext/CMakeLists.txt
+++ b/tests/auto/qml/qqmlcontext/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlcontext
+qt_add_test(tst_qqmlcontext
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmlcontext.cpp
@@ -29,12 +29,12 @@ add_qt_test(tst_qqmlcontext
## Scopes:
#####################################################################
-extend_target(tst_qqmlcontext CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlcontext CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlcontext CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlcontext CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlcpputils/CMakeLists.txt b/tests/auto/qml/qqmlcpputils/CMakeLists.txt
index 1c8bb7fca8..8b12231c2a 100644
--- a/tests/auto/qml/qqmlcpputils/CMakeLists.txt
+++ b/tests/auto/qml/qqmlcpputils/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qqmlcpputils Test:
#####################################################################
-add_qt_test(tst_qqmlcpputils
+qt_add_test(tst_qqmlcpputils
SOURCES
tst_qqmlcpputils.cpp
LIBRARIES
diff --git a/tests/auto/qml/qqmldirparser/CMakeLists.txt b/tests/auto/qml/qqmldirparser/CMakeLists.txt
index 73ac9f64e4..9a408dfd4a 100644
--- a/tests/auto/qml/qqmldirparser/CMakeLists.txt
+++ b/tests/auto/qml/qqmldirparser/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmldirparser
+qt_add_test(tst_qqmldirparser
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmldirparser.cpp
@@ -27,12 +27,12 @@ add_qt_test(tst_qqmldirparser
## Scopes:
#####################################################################
-extend_target(tst_qqmldirparser CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmldirparser CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmldirparser CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmldirparser CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt b/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt
index 57e1930778..8c57d85eb7 100644
--- a/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlecmascript
+qt_add_test(tst_qqmlecmascript
SOURCES
../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
../../shared/util.cpp ../../shared/util.h
@@ -37,7 +37,7 @@ set(qqmlecmascript_resource_files
"data/js/include3.js"
)
-add_qt_resource(tst_qqmlecmascript "qqmlecmascript"
+qt_add_resource(tst_qqmlecmascript "qqmlecmascript"
PREFIX
"/"
FILES
@@ -48,17 +48,17 @@ add_qt_resource(tst_qqmlecmascript "qqmlecmascript"
## Scopes:
#####################################################################
-extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets
+qt_extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)
-extend_target(tst_qqmlecmascript CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlecmascript CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlecmascript/CMakeLists.txt b/tests/auto/qml/qqmlecmascript/CMakeLists.txt
index d467791e87..72ec67ba9f 100644
--- a/tests/auto/qml/qqmlecmascript/CMakeLists.txt
+++ b/tests/auto/qml/qqmlecmascript/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlecmascript
+qt_add_test(tst_qqmlecmascript
SOURCES
../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
../../shared/util.cpp ../../shared/util.h
@@ -44,7 +44,7 @@ set_source_files_properties(
QT_SKIP_QUICKCOMPILER 1)
# special case end
-add_qt_resource(tst_qqmlecmascript "qqmlecmascript"
+qt_add_resource(tst_qqmlecmascript "qqmlecmascript"
PREFIX
"/"
FILES
@@ -55,17 +55,17 @@ add_qt_resource(tst_qqmlecmascript "qqmlecmascript"
## Scopes:
#####################################################################
-extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets
+qt_extend_target(tst_qqmlecmascript CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)
-extend_target(tst_qqmlecmascript CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlecmascript CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlecmascript CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlengine/CMakeLists.txt b/tests/auto/qml/qqmlengine/CMakeLists.txt
index dff90d6c3b..0c87451873 100644
--- a/tests/auto/qml/qqmlengine/CMakeLists.txt
+++ b/tests/auto/qml/qqmlengine/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlengine
+qt_add_test(tst_qqmlengine
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmlengine.cpp
@@ -33,7 +33,7 @@ set(qmake_immediate_resource_files
"data/qrcurls.qml"
)
-add_qt_resource(tst_qqmlengine "qmake_immediate"
+qt_add_resource(tst_qqmlengine "qmake_immediate"
PREFIX
"/"
FILES
@@ -44,17 +44,17 @@ add_qt_resource(tst_qqmlengine "qmake_immediate"
## Scopes:
#####################################################################
-extend_target(tst_qqmlengine CONDITION boot2qt
+qt_extend_target(tst_qqmlengine CONDITION boot2qt
DEFINES
SKIP_GCCORRUPTION_TEST
)
-extend_target(tst_qqmlengine CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlengine CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlengine CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlengine CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt b/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt
index dd5b120560..3dad2d2ce9 100644
--- a/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt
+++ b/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qqmlenginecleanup Test:
#####################################################################
-add_qt_test(tst_qqmlenginecleanup
+qt_add_test(tst_qqmlenginecleanup
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmlenginecleanup.cpp
@@ -20,12 +20,12 @@ add_qt_test(tst_qqmlenginecleanup
## Scopes:
#####################################################################
-extend_target(tst_qqmlenginecleanup CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlenginecleanup CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlenginecleanup CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlenginecleanup CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/.prev_CMakeLists.txt b/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/.prev_CMakeLists.txt
index a96db2a535..f16ce3e6c3 100644
--- a/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## CustomModule Generic Library:
#####################################################################
-add_cmake_library(CustomModule
+qt_add_cmake_library(CustomModule
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../CustomModule"
SOURCES
moduleplugin.cpp
@@ -20,7 +20,7 @@ set(moduleplugin_resource_files
"ModuleType.qml"
)
-add_qt_resource(CustomModule "moduleplugin"
+qt_add_resource(CustomModule "moduleplugin"
PREFIX
"/"
FILES
diff --git a/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/CMakeLists.txt b/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/CMakeLists.txt
index f8a7a5ed93..f98f97cf81 100644
--- a/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/CMakeLists.txt
+++ b/tests/auto/qml/qqmlenginecleanup/CustomModuleImport/CMakeLists.txt
@@ -4,7 +4,7 @@
## CustomModule Generic Library:
#####################################################################
-add_cmake_library(CustomModule
+qt_add_cmake_library(CustomModule
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../CustomModule"
SOURCES
moduleplugin.cpp
@@ -20,7 +20,7 @@ set(moduleplugin_resource_files
"ModuleType.qml"
)
-add_qt_resource(CustomModule "moduleplugin"
+qt_add_resource(CustomModule "moduleplugin"
PREFIX
"/"
FILES
diff --git a/tests/auto/qml/qqmlerror/CMakeLists.txt b/tests/auto/qml/qqmlerror/CMakeLists.txt
index f0b3407a39..a63125137b 100644
--- a/tests/auto/qml/qqmlerror/CMakeLists.txt
+++ b/tests/auto/qml/qqmlerror/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlerror
+qt_add_test(tst_qqmlerror
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmlerror.cpp
@@ -29,12 +29,12 @@ add_qt_test(tst_qqmlerror
## Scopes:
#####################################################################
-extend_target(tst_qqmlerror CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlerror CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlerror CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlerror CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlexpression/CMakeLists.txt b/tests/auto/qml/qqmlexpression/CMakeLists.txt
index e331e5435e..39ded1e25d 100644
--- a/tests/auto/qml/qqmlexpression/CMakeLists.txt
+++ b/tests/auto/qml/qqmlexpression/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlexpression
+qt_add_test(tst_qqmlexpression
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmlexpression.cpp
@@ -29,12 +29,12 @@ add_qt_test(tst_qqmlexpression
## Scopes:
#####################################################################
-extend_target(tst_qqmlexpression CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlexpression CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlexpression CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlexpression CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlextensionplugin/CMakeLists.txt b/tests/auto/qml/qqmlextensionplugin/CMakeLists.txt
index 6d5bc136cc..d0716ed8ff 100644
--- a/tests/auto/qml/qqmlextensionplugin/CMakeLists.txt
+++ b/tests/auto/qml/qqmlextensionplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qqmlextensionplugin Test:
#####################################################################
-add_qt_test(tst_qqmlextensionplugin
+qt_add_test(tst_qqmlextensionplugin
SOURCES
tst_qqmlextensionplugin.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/qml/qqmlfile/CMakeLists.txt b/tests/auto/qml/qqmlfile/CMakeLists.txt
index f1babe3e02..2a0fa63bb8 100644
--- a/tests/auto/qml/qqmlfile/CMakeLists.txt
+++ b/tests/auto/qml/qqmlfile/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qqmlfile Test:
#####################################################################
-add_qt_test(tst_qqmlfile
+qt_add_test(tst_qqmlfile
SOURCES
tst_qqmlfile.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/qml/qqmlfileselector/CMakeLists.txt b/tests/auto/qml/qqmlfileselector/CMakeLists.txt
index 1ef35f88b3..4b85b1c94b 100644
--- a/tests/auto/qml/qqmlfileselector/CMakeLists.txt
+++ b/tests/auto/qml/qqmlfileselector/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlfileselector
+qt_add_test(tst_qqmlfileselector
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmlfileselector.cpp
@@ -29,12 +29,12 @@ add_qt_test(tst_qqmlfileselector
## Scopes:
#####################################################################
-extend_target(tst_qqmlfileselector CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlfileselector CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlfileselector CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlfileselector CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlglobal/CMakeLists.txt b/tests/auto/qml/qqmlglobal/CMakeLists.txt
index 54986b5e80..fa6832b178 100644
--- a/tests/auto/qml/qqmlglobal/CMakeLists.txt
+++ b/tests/auto/qml/qqmlglobal/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qqmlglobal Test:
#####################################################################
-add_qt_test(tst_qqmlglobal
+qt_add_test(tst_qqmlglobal
SOURCES
tst_qqmlglobal.cpp
LIBRARIES
diff --git a/tests/auto/qml/qqmlimport/CMakeLists.txt b/tests/auto/qml/qqmlimport/CMakeLists.txt
index f81706365f..b965a224c6 100644
--- a/tests/auto/qml/qqmlimport/CMakeLists.txt
+++ b/tests/auto/qml/qqmlimport/CMakeLists.txt
@@ -22,7 +22,7 @@ file(GLOB_RECURSE test_data_glob
FormFromQmlDir/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlimport
+qt_add_test(tst_qqmlimport
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmlimport.cpp
@@ -40,12 +40,12 @@ add_qt_test(tst_qqmlimport
## Scopes:
#####################################################################
-extend_target(tst_qqmlimport CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlimport CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlimport CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlimport CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlincubator/CMakeLists.txt b/tests/auto/qml/qqmlincubator/CMakeLists.txt
index 6ceddbd357..a2feb956dc 100644
--- a/tests/auto/qml/qqmlincubator/CMakeLists.txt
+++ b/tests/auto/qml/qqmlincubator/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlincubator
+qt_add_test(tst_qqmlincubator
SOURCES
../../shared/util.cpp ../../shared/util.h
testtypes.cpp testtypes.h
@@ -31,12 +31,12 @@ add_qt_test(tst_qqmlincubator
## Scopes:
#####################################################################
-extend_target(tst_qqmlincubator CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlincubator CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlincubator CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlincubator CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlinfo/CMakeLists.txt b/tests/auto/qml/qqmlinfo/CMakeLists.txt
index a852cce2a0..d6e345a859 100644
--- a/tests/auto/qml/qqmlinfo/CMakeLists.txt
+++ b/tests/auto/qml/qqmlinfo/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlinfo
+qt_add_test(tst_qqmlinfo
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmlinfo.cpp
@@ -29,12 +29,12 @@ add_qt_test(tst_qqmlinfo
## Scopes:
#####################################################################
-extend_target(tst_qqmlinfo CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlinfo CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlinfo CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlinfo CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlinstantiator/CMakeLists.txt b/tests/auto/qml/qqmlinstantiator/CMakeLists.txt
index dbf8c2e35e..3503458a9a 100644
--- a/tests/auto/qml/qqmlinstantiator/CMakeLists.txt
+++ b/tests/auto/qml/qqmlinstantiator/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlinstantiator
+qt_add_test(tst_qqmlinstantiator
SOURCES
../../shared/util.cpp ../../shared/util.h
stringmodel.h
@@ -32,12 +32,12 @@ add_qt_test(tst_qqmlinstantiator
## Scopes:
#####################################################################
-extend_target(tst_qqmlinstantiator CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlinstantiator CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlinstantiator CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlinstantiator CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlitemmodels/CMakeLists.txt b/tests/auto/qml/qqmlitemmodels/CMakeLists.txt
index 988ffc9599..4b2a94a7d1 100644
--- a/tests/auto/qml/qqmlitemmodels/CMakeLists.txt
+++ b/tests/auto/qml/qqmlitemmodels/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlitemmodels
+qt_add_test(tst_qqmlitemmodels
SOURCES
../../shared/util.cpp ../../shared/util.h
qtestmodel.h
@@ -30,12 +30,12 @@ add_qt_test(tst_qqmlitemmodels
## Scopes:
#####################################################################
-extend_target(tst_qqmlitemmodels CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlitemmodels CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlitemmodels CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlitemmodels CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmllanguage/CMakeLists.txt b/tests/auto/qml/qqmllanguage/CMakeLists.txt
index c520d48972..eec5b82607 100644
--- a/tests/auto/qml/qqmllanguage/CMakeLists.txt
+++ b/tests/auto/qml/qqmllanguage/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmllanguage
+qt_add_test(tst_qqmllanguage
SOURCES
../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
../../shared/util.cpp ../../shared/util.h
@@ -44,7 +44,7 @@ if(ANDROID)
"data/I18nType30.qml"
)
- add_qt_resource(tst_qqmllanguage "qqmllanguage"
+ qt_add_resource(tst_qqmllanguage "qqmllanguage"
PREFIX
"/"
FILES
@@ -52,12 +52,12 @@ if(ANDROID)
)
endif()
-extend_target(tst_qqmllanguage CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmllanguage CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmllanguage CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmllanguage CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmllistcompositor/CMakeLists.txt b/tests/auto/qml/qqmllistcompositor/CMakeLists.txt
index 7c6c8145c6..49859e70f2 100644
--- a/tests/auto/qml/qqmllistcompositor/CMakeLists.txt
+++ b/tests/auto/qml/qqmllistcompositor/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qqmllistcompositor Test:
#####################################################################
-add_qt_test(tst_qqmllistcompositor
+qt_add_test(tst_qqmllistcompositor
SOURCES
tst_qqmllistcompositor.cpp
LIBRARIES
diff --git a/tests/auto/qml/qqmllistmodel/CMakeLists.txt b/tests/auto/qml/qqmllistmodel/CMakeLists.txt
index 407ca10381..44589cbc76 100644
--- a/tests/auto/qml/qqmllistmodel/CMakeLists.txt
+++ b/tests/auto/qml/qqmllistmodel/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmllistmodel
+qt_add_test(tst_qqmllistmodel
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmllistmodel.cpp
@@ -33,12 +33,12 @@ add_qt_test(tst_qqmllistmodel
## Scopes:
#####################################################################
-extend_target(tst_qqmllistmodel CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmllistmodel CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmllistmodel CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmllistmodel CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt b/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt
index f36bcceeb2..2e689e0afe 100644
--- a/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt
+++ b/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmllistmodelworkerscript
+qt_add_test(tst_qqmllistmodelworkerscript
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmllistmodelworkerscript.cpp
@@ -33,12 +33,12 @@ add_qt_test(tst_qqmllistmodelworkerscript
## Scopes:
#####################################################################
-extend_target(tst_qqmllistmodelworkerscript CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmllistmodelworkerscript CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmllistmodelworkerscript CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmllistmodelworkerscript CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmllistreference/CMakeLists.txt b/tests/auto/qml/qqmllistreference/CMakeLists.txt
index 7357a030ce..0dc3394971 100644
--- a/tests/auto/qml/qqmllistreference/CMakeLists.txt
+++ b/tests/auto/qml/qqmllistreference/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmllistreference
+qt_add_test(tst_qqmllistreference
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmllistreference.cpp
@@ -31,12 +31,12 @@ add_qt_test(tst_qqmllistreference
## Scopes:
#####################################################################
-extend_target(tst_qqmllistreference CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmllistreference CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmllistreference CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmllistreference CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmllocale/CMakeLists.txt b/tests/auto/qml/qqmllocale/CMakeLists.txt
index 13bfd08505..139582c1a7 100644
--- a/tests/auto/qml/qqmllocale/CMakeLists.txt
+++ b/tests/auto/qml/qqmllocale/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmllocale
+qt_add_test(tst_qqmllocale
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmllocale.cpp
@@ -27,12 +27,12 @@ add_qt_test(tst_qqmllocale
## Scopes:
#####################################################################
-extend_target(tst_qqmllocale CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmllocale CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmllocale CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmllocale CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlmetaobject/CMakeLists.txt b/tests/auto/qml/qqmlmetaobject/CMakeLists.txt
index 02d18c9eb5..2ca7b78d11 100644
--- a/tests/auto/qml/qqmlmetaobject/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmetaobject/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlmetaobject
+qt_add_test(tst_qqmlmetaobject
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmlmetaobject.cpp
@@ -27,12 +27,12 @@ add_qt_test(tst_qqmlmetaobject
## Scopes:
#####################################################################
-extend_target(tst_qqmlmetaobject CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlmetaobject CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlmetaobject CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlmetaobject CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlmetatype/CMakeLists.txt b/tests/auto/qml/qqmlmetatype/CMakeLists.txt
index 38d3034509..1f22d176f9 100644
--- a/tests/auto/qml/qqmlmetatype/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmetatype/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlmetatype
+qt_add_test(tst_qqmlmetatype
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmlmetatype.cpp
@@ -31,7 +31,7 @@ set(qmake_qmlfiles_resource_files
"data/CompositeType.qml"
)
-add_qt_resource(tst_qqmlmetatype "qmake_qmlfiles"
+qt_add_resource(tst_qqmlmetatype "qmake_qmlfiles"
PREFIX
"/tstqqmlmetatype"
FILES
@@ -43,7 +43,7 @@ set(qmake_qmldirresource_resource_files
"data/enumsInRecursiveImport.qml"
)
-add_qt_resource(tst_qqmlmetatype "qmake_qmldirresource"
+qt_add_resource(tst_qqmlmetatype "qmake_qmldirresource"
PREFIX
"/"
FILES
@@ -54,12 +54,12 @@ add_qt_resource(tst_qqmlmetatype "qmake_qmldirresource"
## Scopes:
#####################################################################
-extend_target(tst_qqmlmetatype CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlmetatype CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlmetatype CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlmetatype CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/.prev_CMakeLists.txt
index 7d96a54a8e..d03442b163 100644
--- a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## invalidFirstCommandModule Generic Library:
#####################################################################
-add_cmake_library(invalidFirstCommandModule
+qt_add_cmake_library(invalidFirstCommandModule
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/InvalidFirstCommandModule"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/CMakeLists.txt
index 3f318abfc3..6bb1cbb689 100644
--- a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/CMakeLists.txt
@@ -4,7 +4,7 @@
## invalidFirstCommandModule Generic Library:
#####################################################################
-add_cmake_library(invalidFirstCommandModule
+qt_add_cmake_library(invalidFirstCommandModule
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/InvalidFirstCommandModule"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/.prev_CMakeLists.txt
index 58c1347556..bf9ed44b68 100644
--- a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## invalidNamespaceModule Generic Library:
#####################################################################
-add_cmake_library(invalidNamespaceModule
+qt_add_cmake_library(invalidNamespaceModule
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/InvalidNamespaceModule"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/CMakeLists.txt
index 3ec16a1007..416916a9c8 100644
--- a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/CMakeLists.txt
@@ -4,7 +4,7 @@
## invalidNamespaceModule Generic Library:
#####################################################################
-add_cmake_library(invalidNamespaceModule
+qt_add_cmake_library(invalidNamespaceModule
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/InvalidNamespaceModule"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/.prev_CMakeLists.txt
index 01d30f29a1..59bc23604e 100644
--- a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## nestedPlugin Generic Library:
#####################################################################
-add_cmake_library(nestedPlugin
+qt_add_cmake_library(nestedPlugin
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlNestedPluginType"
SOURCES
nestedPlugin.cpp
diff --git a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt
index b925765217..ea035b9815 100644
--- a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt
@@ -4,7 +4,7 @@
## nestedPlugin Generic Library:
#####################################################################
-add_cmake_library(nestedPlugin
+qt_add_cmake_library(nestedPlugin
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlNestedPluginType"
SOURCES
nestedPlugin.cpp
diff --git a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/.prev_CMakeLists.txt
index f055b4d374..793ef68eb8 100644
--- a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## nonstrictModule Generic Library:
#####################################################################
-add_cmake_library(nonstrictModule
+qt_add_cmake_library(nonstrictModule
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/NonstrictModule"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/CMakeLists.txt
index 32b4393d71..6739b18c53 100644
--- a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/CMakeLists.txt
@@ -4,7 +4,7 @@
## nonstrictModule Generic Library:
#####################################################################
-add_cmake_library(nonstrictModule
+qt_add_cmake_library(nonstrictModule
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/NonstrictModule"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/.prev_CMakeLists.txt
index bd8c267456..0ace521a5d 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## plugin.2.1 Generic Library:
#####################################################################
-add_cmake_library(plugin.2.1
+qt_add_cmake_library(plugin.2.1
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2.1"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/CMakeLists.txt
index c33407a619..5f008737f7 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/CMakeLists.txt
@@ -4,7 +4,7 @@
## plugin.2.1 Generic Library:
#####################################################################
-add_cmake_library(plugin.2.1
+qt_add_cmake_library(plugin.2.1
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2.1"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/.prev_CMakeLists.txt
index fa11a4f0dc..caa119c2d3 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## childplugin Generic Library:
#####################################################################
-add_cmake_library(childplugin
+qt_add_cmake_library(childplugin
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2.1/ChildPlugin"
SOURCES
childplugin.cpp
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/CMakeLists.txt
index 61ab84a7f6..8cb9cc3740 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
## childplugin Generic Library:
#####################################################################
-add_cmake_library(childplugin.2.1 # special case
+qt_add_cmake_library(childplugin.2.1 # special case
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2.1/ChildPlugin"
SOURCES
childplugin.cpp
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/.prev_CMakeLists.txt
index 9bb54a6baf..8d344ca55a 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## plugin.2.2 Generic Library:
#####################################################################
-add_cmake_library(plugin.2.2
+qt_add_cmake_library(plugin.2.2
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2.2"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/CMakeLists.txt
index f5e24fa991..48ebf86a07 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/CMakeLists.txt
@@ -4,7 +4,7 @@
## plugin.2.2 Generic Library:
#####################################################################
-add_cmake_library(plugin.2.2
+qt_add_cmake_library(plugin.2.2
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2.2"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2/.prev_CMakeLists.txt
index 9cd696fa03..ece805b2a8 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## plugin.2 Generic Library:
#####################################################################
-add_cmake_library(plugin.2
+qt_add_cmake_library(plugin.2
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2/CMakeLists.txt
index aafa7fd17e..c1827202e0 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/CMakeLists.txt
@@ -4,7 +4,7 @@
## plugin.2 Generic Library:
#####################################################################
-add_cmake_library(plugin.2
+qt_add_cmake_library(plugin.2
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/.prev_CMakeLists.txt
index 24c06ade06..7446fa49c3 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## childplugin Generic Library:
#####################################################################
-add_cmake_library(childplugin
+qt_add_cmake_library(childplugin
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2/ChildPlugin"
SOURCES
childplugin.cpp
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt
index d4d64577ce..ebf8b65f38 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
## childplugin Generic Library:
#####################################################################
-add_cmake_library(childplugin.2 # special case
+qt_add_cmake_library(childplugin.2 # special case
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2/ChildPlugin"
SOURCES
childplugin.cpp
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin/.prev_CMakeLists.txt
index ecd463389b..f9f5f1ea92 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## plugin Generic Library:
#####################################################################
-add_cmake_library(plugin
+qt_add_cmake_library(plugin
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin/CMakeLists.txt
index 3d9f1e6da2..ced3e394bc 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin/CMakeLists.txt
@@ -4,7 +4,7 @@
## plugin Generic Library:
#####################################################################
-add_cmake_library(plugin
+qt_add_cmake_library(plugin
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/.prev_CMakeLists.txt
index 2037c70f28..ff70bc3f61 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## childplugin Generic Library:
#####################################################################
-add_cmake_library(childplugin
+qt_add_cmake_library(childplugin
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType/ChildPlugin"
SOURCES
childplugin.cpp
diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt
index eb3964a0c3..0490d76d80 100644
--- a/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt
@@ -4,7 +4,7 @@
## childplugin Generic Library:
#####################################################################
-add_cmake_library(childplugin
+qt_add_cmake_library(childplugin
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType/ChildPlugin"
SOURCES
childplugin.cpp
diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/.prev_CMakeLists.txt
index 2cf70361dc..651a4e124b 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## pluginMixed Generic Library:
#####################################################################
-add_cmake_library(pluginMixed
+qt_add_cmake_library(pluginMixed
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlMixedPluginType"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/CMakeLists.txt
index ce2b0a7cf0..a31f9d7a91 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/CMakeLists.txt
@@ -4,7 +4,7 @@
## pluginMixed Generic Library:
#####################################################################
-add_cmake_library(pluginMixed
+qt_add_cmake_library(pluginMixed
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlMixedPluginType"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt
index b5ea40704a..fe49c797b4 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## pluginVersion Generic Library:
#####################################################################
-add_cmake_library(pluginVersion
+qt_add_cmake_library(pluginVersion
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlVersionPluginType"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt
index b3f448f669..2c7d69e408 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt
@@ -4,7 +4,7 @@
## pluginVersion Generic Library:
#####################################################################
-add_cmake_library(pluginVersion
+qt_add_cmake_library(pluginVersion
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlVersionPluginType"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/.prev_CMakeLists.txt
index 5cf3bde36d..825d30bea9 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## pluginWithQmlFile Generic Library:
#####################################################################
-add_cmake_library(pluginWithQmlFile
+qt_add_cmake_library(pluginWithQmlFile
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestPluginWithQmlFile"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/CMakeLists.txt
index 7cb468c169..29fa258de8 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/CMakeLists.txt
@@ -4,7 +4,7 @@
## pluginWithQmlFile Generic Library:
#####################################################################
-add_cmake_library(pluginWithQmlFile
+qt_add_cmake_library(pluginWithQmlFile
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestPluginWithQmlFile"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/.prev_CMakeLists.txt
index 0a8844b169..94e7013e32 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## Plugin Generic Library:
#####################################################################
-add_cmake_library(Plugin
+qt_add_cmake_library(Plugin
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/WrongCase"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/CMakeLists.txt
index 8ceb2efa99..b14b40fd78 100644
--- a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/CMakeLists.txt
@@ -4,7 +4,7 @@
## Plugin Generic Library:
#####################################################################
-add_cmake_library(Plugin
+qt_add_cmake_library(Plugin
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/WrongCase"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt
index dd74064201..9b37de6443 100644
--- a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## preemptedStrictModule Generic Library:
#####################################################################
-add_cmake_library(preemptedStrictModule
+qt_add_cmake_library(preemptedStrictModule
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptedStrictModule"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt
index fe4517571a..7068f51f03 100644
--- a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt
@@ -4,7 +4,7 @@
## preemptedStrictModule Generic Library:
#####################################################################
-add_cmake_library(preemptedStrictModule
+qt_add_cmake_library(preemptedStrictModule
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptedStrictModule"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/.prev_CMakeLists.txt
index a436682442..5ed3768a75 100644
--- a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## preemptiveModule Generic Library:
#####################################################################
-add_cmake_library(preemptiveModule
+qt_add_cmake_library(preemptiveModule
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptiveModule"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/CMakeLists.txt
index c2510ec868..7e8b4d0739 100644
--- a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/CMakeLists.txt
@@ -4,7 +4,7 @@
## preemptiveModule Generic Library:
#####################################################################
-add_cmake_library(preemptiveModule
+qt_add_cmake_library(preemptiveModule
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptiveModule"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/protectedModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/protectedModule/.prev_CMakeLists.txt
index dfd26339ee..65b4d1bc40 100644
--- a/tests/auto/qml/qqmlmoduleplugin/protectedModule/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/protectedModule/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## protectedModule Generic Library:
#####################################################################
-add_cmake_library(protectedModule
+qt_add_cmake_library(protectedModule
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/ProtectedModule"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/protectedModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/protectedModule/CMakeLists.txt
index 8522d435b2..be50685c09 100644
--- a/tests/auto/qml/qqmlmoduleplugin/protectedModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/protectedModule/CMakeLists.txt
@@ -4,7 +4,7 @@
## protectedModule Generic Library:
#####################################################################
-add_cmake_library(protectedModule
+qt_add_cmake_library(protectedModule
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/ProtectedModule"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/strictModule.2/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/strictModule.2/.prev_CMakeLists.txt
index ee29087a5d..d57f762100 100644
--- a/tests/auto/qml/qqmlmoduleplugin/strictModule.2/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/strictModule.2/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## strictModule.2 Generic Library:
#####################################################################
-add_cmake_library(strictModule.2
+qt_add_cmake_library(strictModule.2
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/StrictModule.2"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/strictModule.2/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/strictModule.2/CMakeLists.txt
index 6a5aecfc1f..6229b9efaf 100644
--- a/tests/auto/qml/qqmlmoduleplugin/strictModule.2/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/strictModule.2/CMakeLists.txt
@@ -4,7 +4,7 @@
## strictModule.2 Generic Library:
#####################################################################
-add_cmake_library(strictModule.2
+qt_add_cmake_library(strictModule.2
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/StrictModule.2"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/strictModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/strictModule/.prev_CMakeLists.txt
index 299812ecdb..d76e1600ae 100644
--- a/tests/auto/qml/qqmlmoduleplugin/strictModule/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/strictModule/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## strictModule Generic Library:
#####################################################################
-add_cmake_library(strictModule
+qt_add_cmake_library(strictModule
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/StrictModule"
SOURCES
diff --git a/tests/auto/qml/qqmlmoduleplugin/strictModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/strictModule/CMakeLists.txt
index 690ab0b48b..4a5a79be4d 100644
--- a/tests/auto/qml/qqmlmoduleplugin/strictModule/CMakeLists.txt
+++ b/tests/auto/qml/qqmlmoduleplugin/strictModule/CMakeLists.txt
@@ -4,7 +4,7 @@
## strictModule Generic Library:
#####################################################################
-add_cmake_library(strictModule
+qt_add_cmake_library(strictModule
MODULE
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/StrictModule"
SOURCES
diff --git a/tests/auto/qml/qqmlnotifier/CMakeLists.txt b/tests/auto/qml/qqmlnotifier/CMakeLists.txt
index 543e9e1ea3..5756cb353d 100644
--- a/tests/auto/qml/qqmlnotifier/CMakeLists.txt
+++ b/tests/auto/qml/qqmlnotifier/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlnotifier
+qt_add_test(tst_qqmlnotifier
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmlnotifier.cpp
@@ -25,12 +25,12 @@ add_qt_test(tst_qqmlnotifier
## Scopes:
#####################################################################
-extend_target(tst_qqmlnotifier CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlnotifier CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlnotifier CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlnotifier CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlobjectmodel/CMakeLists.txt b/tests/auto/qml/qqmlobjectmodel/CMakeLists.txt
index fa4e9c5913..6be3149ccb 100644
--- a/tests/auto/qml/qqmlobjectmodel/CMakeLists.txt
+++ b/tests/auto/qml/qqmlobjectmodel/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qqmlobjectmodel Test:
#####################################################################
-add_qt_test(tst_qqmlobjectmodel
+qt_add_test(tst_qqmlobjectmodel
SOURCES
tst_qqmlobjectmodel.cpp
LIBRARIES
diff --git a/tests/auto/qml/qqmlopenmetaobject/CMakeLists.txt b/tests/auto/qml/qqmlopenmetaobject/CMakeLists.txt
index 8920bd8528..b20b8363e3 100644
--- a/tests/auto/qml/qqmlopenmetaobject/CMakeLists.txt
+++ b/tests/auto/qml/qqmlopenmetaobject/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qqmlopenmetaobject Test:
#####################################################################
-add_qt_test(tst_qqmlopenmetaobject
+qt_add_test(tst_qqmlopenmetaobject
SOURCES
tst_qqmlopenmetaobject.cpp
LIBRARIES
diff --git a/tests/auto/qml/qqmlparser/CMakeLists.txt b/tests/auto/qml/qqmlparser/CMakeLists.txt
index 7c327dcfca..074e979d86 100644
--- a/tests/auto/qml/qqmlparser/CMakeLists.txt
+++ b/tests/auto/qml/qqmlparser/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlparser
+qt_add_test(tst_qqmlparser
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmlparser.cpp
@@ -29,17 +29,17 @@ add_qt_test(tst_qqmlparser
## Scopes:
#####################################################################
-extend_target(tst_qqmlparser CONDITION cross_compile
+qt_extend_target(tst_qqmlparser CONDITION cross_compile
DEFINES
QTEST_CROSS_COMPILED
)
-extend_target(tst_qqmlparser CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlparser CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlparser CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlparser CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlpromise/CMakeLists.txt b/tests/auto/qml/qqmlpromise/CMakeLists.txt
index 9f8b4ef1c2..06cbfdf714 100644
--- a/tests/auto/qml/qqmlpromise/CMakeLists.txt
+++ b/tests/auto/qml/qqmlpromise/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlpromise
+qt_add_test(tst_qqmlpromise
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmlpromise.cpp
@@ -35,12 +35,12 @@ add_qt_test(tst_qqmlpromise
## Scopes:
#####################################################################
-extend_target(tst_qqmlpromise CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlpromise CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlpromise CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlpromise CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlproperty/CMakeLists.txt b/tests/auto/qml/qqmlproperty/CMakeLists.txt
index f34d6c372f..0bb6c9e2e7 100644
--- a/tests/auto/qml/qqmlproperty/CMakeLists.txt
+++ b/tests/auto/qml/qqmlproperty/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlproperty
+qt_add_test(tst_qqmlproperty
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmlproperty.cpp
@@ -29,12 +29,12 @@ add_qt_test(tst_qqmlproperty
## Scopes:
#####################################################################
-extend_target(tst_qqmlproperty CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlproperty CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlproperty CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlproperty CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlpropertycache/CMakeLists.txt b/tests/auto/qml/qqmlpropertycache/CMakeLists.txt
index b5ae21f026..5666ca191c 100644
--- a/tests/auto/qml/qqmlpropertycache/CMakeLists.txt
+++ b/tests/auto/qml/qqmlpropertycache/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlpropertycache
+qt_add_test(tst_qqmlpropertycache
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmlpropertycache.cpp
@@ -29,12 +29,12 @@ add_qt_test(tst_qqmlpropertycache
## Scopes:
#####################################################################
-extend_target(tst_qqmlpropertycache CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlpropertycache CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlpropertycache CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlpropertycache CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlpropertymap/CMakeLists.txt b/tests/auto/qml/qqmlpropertymap/CMakeLists.txt
index 2daf727a5c..b388266e88 100644
--- a/tests/auto/qml/qqmlpropertymap/CMakeLists.txt
+++ b/tests/auto/qml/qqmlpropertymap/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlpropertymap
+qt_add_test(tst_qqmlpropertymap
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmlpropertymap.cpp
@@ -31,12 +31,12 @@ add_qt_test(tst_qqmlpropertymap
## Scopes:
#####################################################################
-extend_target(tst_qqmlpropertymap CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlpropertymap CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlpropertymap CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlpropertymap CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlqt/CMakeLists.txt b/tests/auto/qml/qqmlqt/CMakeLists.txt
index e6b835d89a..e81e9cba58 100644
--- a/tests/auto/qml/qqmlqt/CMakeLists.txt
+++ b/tests/auto/qml/qqmlqt/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlqt
+qt_add_test(tst_qqmlqt
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmlqt.cpp
@@ -31,12 +31,12 @@ add_qt_test(tst_qqmlqt
## Scopes:
#####################################################################
-extend_target(tst_qqmlqt CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlqt CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlqt CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlqt CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlsettings/CMakeLists.txt b/tests/auto/qml/qqmlsettings/CMakeLists.txt
index cf0628867c..6463c414d0 100644
--- a/tests/auto/qml/qqmlsettings/CMakeLists.txt
+++ b/tests/auto/qml/qqmlsettings/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlsettings
+qt_add_test(tst_qqmlsettings
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmlsettings.cpp
@@ -25,12 +25,12 @@ add_qt_test(tst_qqmlsettings
## Scopes:
#####################################################################
-extend_target(tst_qqmlsettings CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlsettings CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlsettings CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlsettings CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt b/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt
index c064f18280..23b57c97fb 100644
--- a/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt
+++ b/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlsqldatabase
+qt_add_test(tst_qqmlsqldatabase
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmlsqldatabase.cpp
@@ -32,12 +32,12 @@ add_qt_test(tst_qqmlsqldatabase
## Scopes:
#####################################################################
-extend_target(tst_qqmlsqldatabase CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlsqldatabase CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlsqldatabase CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlsqldatabase CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlstatemachine/CMakeLists.txt b/tests/auto/qml/qqmlstatemachine/CMakeLists.txt
index fb546bfdb5..dc954aea26 100644
--- a/tests/auto/qml/qqmlstatemachine/CMakeLists.txt
+++ b/tests/auto/qml/qqmlstatemachine/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qqmlstatemachine Test:
#####################################################################
-add_qt_test(tst_qqmlstatemachine
+qt_add_test(tst_qqmlstatemachine
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmlstatemachine.cpp
@@ -24,12 +24,12 @@ add_qt_test(tst_qqmlstatemachine
## Scopes:
#####################################################################
-extend_target(tst_qqmlstatemachine CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlstatemachine CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlstatemachine CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlstatemachine CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmltablemodel/CMakeLists.txt b/tests/auto/qml/qqmltablemodel/CMakeLists.txt
index 88c35aa111..519f3334ad 100644
--- a/tests/auto/qml/qqmltablemodel/CMakeLists.txt
+++ b/tests/auto/qml/qqmltablemodel/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmltablemodel
+qt_add_test(tst_qqmltablemodel
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmltablemodel.cpp
@@ -31,12 +31,12 @@ add_qt_test(tst_qqmltablemodel
## Scopes:
#####################################################################
-extend_target(tst_qqmltablemodel CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmltablemodel CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmltablemodel CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmltablemodel CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmltimer/CMakeLists.txt b/tests/auto/qml/qqmltimer/CMakeLists.txt
index 0a8982d1c6..eadc846d71 100644
--- a/tests/auto/qml/qqmltimer/CMakeLists.txt
+++ b/tests/auto/qml/qqmltimer/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qqmltimer Test:
#####################################################################
-add_qt_test(tst_qqmltimer
+qt_add_test(tst_qqmltimer
SOURCES
tst_qqmltimer.cpp
LIBRARIES
diff --git a/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt b/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt
index 968b04f6ae..d835cf8773 100644
--- a/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmltranslation
+qt_add_test(tst_qqmltranslation
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmltranslation.cpp
@@ -32,7 +32,7 @@ set(translation_resource_files
"translation.qml"
)
-add_qt_resource(tst_qqmltranslation "translation"
+qt_add_resource(tst_qqmltranslation "translation"
PREFIX
"/"
BASE
@@ -45,12 +45,12 @@ add_qt_resource(tst_qqmltranslation "translation"
## Scopes:
#####################################################################
-extend_target(tst_qqmltranslation CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmltranslation CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmltranslation CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmltranslation CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmltranslation/CMakeLists.txt b/tests/auto/qml/qqmltranslation/CMakeLists.txt
index e6488e42dc..45fc4c234f 100644
--- a/tests/auto/qml/qqmltranslation/CMakeLists.txt
+++ b/tests/auto/qml/qqmltranslation/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmltranslation
+qt_add_test(tst_qqmltranslation
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qqmltranslation.cpp
@@ -46,7 +46,7 @@ set_source_files_properties(
)
# special case end
-add_qt_resource(tst_qqmltranslation "translation"
+qt_add_resource(tst_qqmltranslation "translation"
PREFIX
"/"
BASE
@@ -59,12 +59,12 @@ add_qt_resource(tst_qqmltranslation "translation"
## Scopes:
#####################################################################
-extend_target(tst_qqmltranslation CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmltranslation CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmltranslation CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmltranslation CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmltypeloader/CMakeLists.txt b/tests/auto/qml/qqmltypeloader/CMakeLists.txt
index 512adcf953..8e71ea4315 100644
--- a/tests/auto/qml/qqmltypeloader/CMakeLists.txt
+++ b/tests/auto/qml/qqmltypeloader/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmltypeloader
+qt_add_test(tst_qqmltypeloader
SOURCES
../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
../../shared/util.cpp ../../shared/util.h
@@ -29,12 +29,12 @@ add_qt_test(tst_qqmltypeloader
## Scopes:
#####################################################################
-extend_target(tst_qqmltypeloader CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmltypeloader CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmltypeloader CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmltypeloader CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmltypeloader/SlowImport/.prev_CMakeLists.txt b/tests/auto/qml/qqmltypeloader/SlowImport/.prev_CMakeLists.txt
index 5951b4e84c..7dd4bb659c 100644
--- a/tests/auto/qml/qqmltypeloader/SlowImport/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qqmltypeloader/SlowImport/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## Slow Generic Library:
#####################################################################
-add_cmake_library(Slow
+qt_add_cmake_library(Slow
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../Slow"
SOURCES
plugin.cpp plugin.h
diff --git a/tests/auto/qml/qqmltypeloader/SlowImport/CMakeLists.txt b/tests/auto/qml/qqmltypeloader/SlowImport/CMakeLists.txt
index 89aaa009ab..c377016682 100644
--- a/tests/auto/qml/qqmltypeloader/SlowImport/CMakeLists.txt
+++ b/tests/auto/qml/qqmltypeloader/SlowImport/CMakeLists.txt
@@ -4,7 +4,7 @@
## Slow Generic Library:
#####################################################################
-add_cmake_library(Slow
+qt_add_cmake_library(Slow
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../Slow"
SOURCES
plugin.cpp plugin.h
diff --git a/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt b/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt
index 0b34b211a3..c11d932c65 100644
--- a/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt
+++ b/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlvaluetypeproviders
+qt_add_test(tst_qqmlvaluetypeproviders
SOURCES
../../shared/util.cpp ../../shared/util.h
testtypes.cpp testtypes.h
@@ -32,12 +32,12 @@ add_qt_test(tst_qqmlvaluetypeproviders
## Scopes:
#####################################################################
-extend_target(tst_qqmlvaluetypeproviders CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlvaluetypeproviders CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlvaluetypeproviders CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlvaluetypeproviders CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt b/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt
index 22cec428d6..ce5ff68040 100644
--- a/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt
+++ b/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlvaluetypes
+qt_add_test(tst_qqmlvaluetypes
SOURCES
../../shared/util.cpp ../../shared/util.h
testtypes.cpp testtypes.h
@@ -35,12 +35,12 @@ add_qt_test(tst_qqmlvaluetypes
## Scopes:
#####################################################################
-extend_target(tst_qqmlvaluetypes CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlvaluetypes CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlvaluetypes CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlvaluetypes CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt b/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt
index f5928edd4e..547f323190 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt
+++ b/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qqmlxmlhttprequest
+qt_add_test(tst_qqmlxmlhttprequest
SOURCES
../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
../../shared/util.cpp ../../shared/util.h
@@ -31,12 +31,12 @@ add_qt_test(tst_qqmlxmlhttprequest
## Scopes:
#####################################################################
-extend_target(tst_qqmlxmlhttprequest CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qqmlxmlhttprequest CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qqmlxmlhttprequest CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qqmlxmlhttprequest CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt b/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt
index db4af83706..eee005c48a 100644
--- a/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickfolderlistmodel
+qt_add_test(tst_qquickfolderlistmodel
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickfolderlistmodel.cpp
@@ -31,7 +31,7 @@ set(introspect_resource_files
"txtdir/hello.txt"
)
-add_qt_resource(tst_qquickfolderlistmodel "introspect"
+qt_add_resource(tst_qquickfolderlistmodel "introspect"
PREFIX
"/myprefix/subdir"
BASE
@@ -44,12 +44,12 @@ add_qt_resource(tst_qquickfolderlistmodel "introspect"
## Scopes:
#####################################################################
-extend_target(tst_qquickfolderlistmodel CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickfolderlistmodel CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickfolderlistmodel CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickfolderlistmodel CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt b/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt
index 0d7a3f4df9..5938a36f6f 100644
--- a/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt
+++ b/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickfolderlistmodel
+qt_add_test(tst_qquickfolderlistmodel
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickfolderlistmodel.cpp
@@ -34,7 +34,7 @@ set(introspect_resource_files
"txtdir/hello.txt"
)
-add_qt_resource(tst_qquickfolderlistmodel "introspect"
+qt_add_resource(tst_qquickfolderlistmodel "introspect"
PREFIX
"/myprefix/subdir"
BASE
@@ -47,12 +47,12 @@ add_qt_resource(tst_qquickfolderlistmodel "introspect"
## Scopes:
#####################################################################
-extend_target(tst_qquickfolderlistmodel CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickfolderlistmodel CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickfolderlistmodel CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickfolderlistmodel CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qquickworkerscript/CMakeLists.txt b/tests/auto/qml/qquickworkerscript/CMakeLists.txt
index 08f223d763..511144c6af 100644
--- a/tests/auto/qml/qquickworkerscript/CMakeLists.txt
+++ b/tests/auto/qml/qquickworkerscript/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickworkerscript
+qt_add_test(tst_qquickworkerscript
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickworkerscript.cpp
@@ -31,12 +31,12 @@ add_qt_test(tst_qquickworkerscript
## Scopes:
#####################################################################
-extend_target(tst_qquickworkerscript CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickworkerscript CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickworkerscript CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickworkerscript CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qrcqml/CMakeLists.txt b/tests/auto/qml/qrcqml/CMakeLists.txt
index e2401230e5..88e910ba05 100644
--- a/tests/auto/qml/qrcqml/CMakeLists.txt
+++ b/tests/auto/qml/qrcqml/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qrcqml Test:
#####################################################################
-add_qt_test(tst_qrcqml
+qt_add_test(tst_qrcqml
SOURCES
tst_qrcqml.cpp
PUBLIC_LIBRARIES
@@ -31,7 +31,7 @@ set(qrcqml_resource_files
"data/main2.qml"
)
-add_qt_resource(tst_qrcqml "qrcqml"
+qt_add_resource(tst_qrcqml "qrcqml"
PREFIX
"/"
FILES
@@ -48,7 +48,7 @@ set(qrcqml1_resource_files
"data/main3.qml"
)
-add_qt_resource(tst_qrcqml "qrcqml1"
+qt_add_resource(tst_qrcqml "qrcqml1"
PREFIX
"/search"
FILES
@@ -61,7 +61,7 @@ set(qrcqml2_resource_files
"data/SubDir.qml"
)
-add_qt_resource(tst_qrcqml "qrcqml2"
+qt_add_resource(tst_qrcqml "qrcqml2"
PREFIX
"/search/data"
FILES
@@ -78,7 +78,7 @@ set(qrcqml3_resource_files
"data/imports/QrcImport/qmldir"
)
-add_qt_resource(tst_qrcqml "qrcqml3"
+qt_add_resource(tst_qrcqml "qrcqml3"
PREFIX
"/imports"
FILES
diff --git a/tests/auto/qml/qtqmlmodules/CMakeLists.txt b/tests/auto/qml/qtqmlmodules/CMakeLists.txt
index 7fd1021715..190a8d3034 100644
--- a/tests/auto/qml/qtqmlmodules/CMakeLists.txt
+++ b/tests/auto/qml/qtqmlmodules/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qtqmlmodules
+qt_add_test(tst_qtqmlmodules
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qtqmlmodules.cpp
@@ -29,12 +29,12 @@ add_qt_test(tst_qtqmlmodules
## Scopes:
#####################################################################
-extend_target(tst_qtqmlmodules CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qtqmlmodules CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qtqmlmodules CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qtqmlmodules CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qv4assembler/CMakeLists.txt b/tests/auto/qml/qv4assembler/CMakeLists.txt
index dd1d0d542a..b16aaf9f3f 100644
--- a/tests/auto/qml/qv4assembler/CMakeLists.txt
+++ b/tests/auto/qml/qv4assembler/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qv4assembler
+qt_add_test(tst_qv4assembler
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qv4assembler.cpp
@@ -27,12 +27,12 @@ add_qt_test(tst_qv4assembler
## Scopes:
#####################################################################
-extend_target(tst_qv4assembler CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qv4assembler CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qv4assembler CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qv4assembler CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qv4identifiertable/CMakeLists.txt b/tests/auto/qml/qv4identifiertable/CMakeLists.txt
index b249d36a25..dd31cde5ad 100644
--- a/tests/auto/qml/qv4identifiertable/CMakeLists.txt
+++ b/tests/auto/qml/qv4identifiertable/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qv4identifiertable Test:
#####################################################################
-add_qt_test(tst_qv4identifiertable
+qt_add_test(tst_qv4identifiertable
SOURCES
tst_qv4identifiertable.cpp
LIBRARIES
diff --git a/tests/auto/qml/qv4mm/CMakeLists.txt b/tests/auto/qml/qv4mm/CMakeLists.txt
index db84a6a36b..bd7c328acf 100644
--- a/tests/auto/qml/qv4mm/CMakeLists.txt
+++ b/tests/auto/qml/qv4mm/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qv4mm
+qt_add_test(tst_qv4mm
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qv4mm.cpp
@@ -27,12 +27,12 @@ add_qt_test(tst_qv4mm
## Scopes:
#####################################################################
-extend_target(tst_qv4mm CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qv4mm CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qv4mm CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qv4mm CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/qml/qv4regexp/CMakeLists.txt b/tests/auto/qml/qv4regexp/CMakeLists.txt
index 2044b6758e..5eb99906b1 100644
--- a/tests/auto/qml/qv4regexp/CMakeLists.txt
+++ b/tests/auto/qml/qv4regexp/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qv4regexp Test:
#####################################################################
-add_qt_test(tst_qv4regexp
+qt_add_test(tst_qv4regexp
SOURCES
tst_qv4regexp.cpp
LIBRARIES
diff --git a/tests/auto/qml/qwidgetsinqml/CMakeLists.txt b/tests/auto/qml/qwidgetsinqml/CMakeLists.txt
index b297800281..fb6f9c9d6b 100644
--- a/tests/auto/qml/qwidgetsinqml/CMakeLists.txt
+++ b/tests/auto/qml/qwidgetsinqml/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qwidgetsinqml Test:
#####################################################################
-add_qt_test(tst_qwidgetsinqml
+qt_add_test(tst_qwidgetsinqml
SOURCES
tst_qwidgetsinqml.cpp
DEFINES
diff --git a/tests/auto/qml/v4misc/CMakeLists.txt b/tests/auto/qml/v4misc/CMakeLists.txt
index ff9849da1e..75e7dcc88b 100644
--- a/tests/auto/qml/v4misc/CMakeLists.txt
+++ b/tests/auto/qml/v4misc/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_v4misc Test:
#####################################################################
-add_qt_test(tst_v4misc
+qt_add_test(tst_v4misc
SOURCES
tst_v4misc.cpp
LIBRARIES
diff --git a/tests/auto/qmldevtools/compile/CMakeLists.txt b/tests/auto/qmldevtools/compile/CMakeLists.txt
index f463285ca0..11cfb05078 100644
--- a/tests/auto/qmldevtools/compile/CMakeLists.txt
+++ b/tests/auto/qmldevtools/compile/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_compile Binary:
#####################################################################
-add_qt_executable(tst_compile
+qt_add_executable(tst_compile
GUI
SOURCES
tst_compile.cpp
@@ -21,14 +21,14 @@ add_qt_executable(tst_compile
## Scopes:
#####################################################################
-extend_target(tst_compile CONDITION force_bootstrap
+qt_extend_target(tst_compile CONDITION force_bootstrap
LIBRARIES
Qt::BootstrapPrivate
PUBLIC_LIBRARIES
Qt::Bootstrap
)
-extend_target(tst_compile CONDITION NOT force_bootstrap
+qt_extend_target(tst_compile CONDITION NOT force_bootstrap
PUBLIC_LIBRARIES
Qt::Core
)
diff --git a/tests/auto/qmltest-blacklist/shortcut/CMakeLists.txt b/tests/auto/qmltest-blacklist/shortcut/CMakeLists.txt
index 81fbedd01a..0d2623d0d6 100644
--- a/tests/auto/qmltest-blacklist/shortcut/CMakeLists.txt
+++ b/tests/auto/qmltest-blacklist/shortcut/CMakeLists.txt
@@ -4,7 +4,7 @@
## shortcut Test:
#####################################################################
-add_qt_test(shortcut
+qt_add_test(shortcut
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/animatedimage/CMakeLists.txt b/tests/auto/qmltest/animatedimage/CMakeLists.txt
index a8070a4f1d..d30d87316d 100644
--- a/tests/auto/qmltest/animatedimage/CMakeLists.txt
+++ b/tests/auto/qmltest/animatedimage/CMakeLists.txt
@@ -4,7 +4,7 @@
## animatedimage Test:
#####################################################################
-add_qt_test(animatedimage
+qt_add_test(animatedimage
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/animations/CMakeLists.txt b/tests/auto/qmltest/animations/CMakeLists.txt
index ba445ce942..d41f46ba1d 100644
--- a/tests/auto/qmltest/animations/CMakeLists.txt
+++ b/tests/auto/qmltest/animations/CMakeLists.txt
@@ -4,7 +4,7 @@
## animations Test:
#####################################################################
-add_qt_test(animations
+qt_add_test(animations
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/borderimage/CMakeLists.txt b/tests/auto/qmltest/borderimage/CMakeLists.txt
index 1b96fc2c00..08e23089b1 100644
--- a/tests/auto/qmltest/borderimage/CMakeLists.txt
+++ b/tests/auto/qmltest/borderimage/CMakeLists.txt
@@ -4,7 +4,7 @@
## borderimage Test:
#####################################################################
-add_qt_test(borderimage
+qt_add_test(borderimage
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/buttonclick/CMakeLists.txt b/tests/auto/qmltest/buttonclick/CMakeLists.txt
index 97d6cabd3b..014372220c 100644
--- a/tests/auto/qmltest/buttonclick/CMakeLists.txt
+++ b/tests/auto/qmltest/buttonclick/CMakeLists.txt
@@ -4,7 +4,7 @@
## buttonclick Test:
#####################################################################
-add_qt_test(buttonclick
+qt_add_test(buttonclick
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/createbenchmark/CMakeLists.txt b/tests/auto/qmltest/createbenchmark/CMakeLists.txt
index 971fced83e..429f454b62 100644
--- a/tests/auto/qmltest/createbenchmark/CMakeLists.txt
+++ b/tests/auto/qmltest/createbenchmark/CMakeLists.txt
@@ -4,7 +4,7 @@
## createbenchmark Test:
#####################################################################
-add_qt_test(createbenchmark
+qt_add_test(createbenchmark
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/events/CMakeLists.txt b/tests/auto/qmltest/events/CMakeLists.txt
index 0fc18078bf..1382529616 100644
--- a/tests/auto/qmltest/events/CMakeLists.txt
+++ b/tests/auto/qmltest/events/CMakeLists.txt
@@ -4,7 +4,7 @@
## events Test:
#####################################################################
-add_qt_test(events
+qt_add_test(events
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/fontloader/CMakeLists.txt b/tests/auto/qmltest/fontloader/CMakeLists.txt
index f9c9ce046f..7230785db7 100644
--- a/tests/auto/qmltest/fontloader/CMakeLists.txt
+++ b/tests/auto/qmltest/fontloader/CMakeLists.txt
@@ -4,7 +4,7 @@
## fontloader Test:
#####################################################################
-add_qt_test(fontloader
+qt_add_test(fontloader
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/gradient/CMakeLists.txt b/tests/auto/qmltest/gradient/CMakeLists.txt
index 18e723f65a..c5341f4290 100644
--- a/tests/auto/qmltest/gradient/CMakeLists.txt
+++ b/tests/auto/qmltest/gradient/CMakeLists.txt
@@ -4,7 +4,7 @@
## gradient Test:
#####################################################################
-add_qt_test(gradient
+qt_add_test(gradient
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/image/CMakeLists.txt b/tests/auto/qmltest/image/CMakeLists.txt
index 079aaa0e4b..5d81076031 100644
--- a/tests/auto/qmltest/image/CMakeLists.txt
+++ b/tests/auto/qmltest/image/CMakeLists.txt
@@ -4,7 +4,7 @@
## image Test:
#####################################################################
-add_qt_test(image
+qt_add_test(image
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/itemgrabber/CMakeLists.txt b/tests/auto/qmltest/itemgrabber/CMakeLists.txt
index eb231f7e78..5570f31f49 100644
--- a/tests/auto/qmltest/itemgrabber/CMakeLists.txt
+++ b/tests/auto/qmltest/itemgrabber/CMakeLists.txt
@@ -4,7 +4,7 @@
## itemgrabber Test:
#####################################################################
-add_qt_test(itemgrabber
+qt_add_test(itemgrabber
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/layout/CMakeLists.txt b/tests/auto/qmltest/layout/CMakeLists.txt
index 45b320b368..e237397be4 100644
--- a/tests/auto/qmltest/layout/CMakeLists.txt
+++ b/tests/auto/qmltest/layout/CMakeLists.txt
@@ -4,7 +4,7 @@
## layout Test:
#####################################################################
-add_qt_test(layout
+qt_add_test(layout
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/listmodel/CMakeLists.txt b/tests/auto/qmltest/listmodel/CMakeLists.txt
index 5b9b24ccb2..29a60be7ae 100644
--- a/tests/auto/qmltest/listmodel/CMakeLists.txt
+++ b/tests/auto/qmltest/listmodel/CMakeLists.txt
@@ -4,7 +4,7 @@
## listmodel Test:
#####################################################################
-add_qt_test(listmodel
+qt_add_test(listmodel
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/listview/CMakeLists.txt b/tests/auto/qmltest/listview/CMakeLists.txt
index 6f79e86afb..1eed3177d8 100644
--- a/tests/auto/qmltest/listview/CMakeLists.txt
+++ b/tests/auto/qmltest/listview/CMakeLists.txt
@@ -4,7 +4,7 @@
## listview Test:
#####################################################################
-add_qt_test(listview
+qt_add_test(listview
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/objectmodel/CMakeLists.txt b/tests/auto/qmltest/objectmodel/CMakeLists.txt
index 426c401a54..ece17f4ac7 100644
--- a/tests/auto/qmltest/objectmodel/CMakeLists.txt
+++ b/tests/auto/qmltest/objectmodel/CMakeLists.txt
@@ -4,7 +4,7 @@
## objectmodel Test:
#####################################################################
-add_qt_test(objectmodel
+qt_add_test(objectmodel
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/pathview/CMakeLists.txt b/tests/auto/qmltest/pathview/CMakeLists.txt
index d287ff663c..6f19715ba4 100644
--- a/tests/auto/qmltest/pathview/CMakeLists.txt
+++ b/tests/auto/qmltest/pathview/CMakeLists.txt
@@ -4,7 +4,7 @@
## pathview Test:
#####################################################################
-add_qt_test(pathview
+qt_add_test(pathview
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/pixel/CMakeLists.txt b/tests/auto/qmltest/pixel/CMakeLists.txt
index 66542b0bba..64ccfc207d 100644
--- a/tests/auto/qmltest/pixel/CMakeLists.txt
+++ b/tests/auto/qmltest/pixel/CMakeLists.txt
@@ -4,7 +4,7 @@
## pixel Test:
#####################################################################
-add_qt_test(pixel
+qt_add_test(pixel
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/positioners/CMakeLists.txt b/tests/auto/qmltest/positioners/CMakeLists.txt
index e1ddbe8f3c..909558211a 100644
--- a/tests/auto/qmltest/positioners/CMakeLists.txt
+++ b/tests/auto/qmltest/positioners/CMakeLists.txt
@@ -4,7 +4,7 @@
## positioners Test:
#####################################################################
-add_qt_test(positioners
+qt_add_test(positioners
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/qqmlbinding/CMakeLists.txt b/tests/auto/qmltest/qqmlbinding/CMakeLists.txt
index 0df865467b..a0731d6142 100644
--- a/tests/auto/qmltest/qqmlbinding/CMakeLists.txt
+++ b/tests/auto/qmltest/qqmlbinding/CMakeLists.txt
@@ -4,7 +4,7 @@
## qqmlbinding Test:
#####################################################################
-add_qt_test(qqmlbinding
+qt_add_test(qqmlbinding
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/qtbug46798/CMakeLists.txt b/tests/auto/qmltest/qtbug46798/CMakeLists.txt
index f614f0adee..a7367a1d87 100644
--- a/tests/auto/qmltest/qtbug46798/CMakeLists.txt
+++ b/tests/auto/qmltest/qtbug46798/CMakeLists.txt
@@ -4,7 +4,7 @@
## qtbug46798 Test:
#####################################################################
-add_qt_test(qtbug46798
+qt_add_test(qtbug46798
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/rectangle/CMakeLists.txt b/tests/auto/qmltest/rectangle/CMakeLists.txt
index df432f08c7..8bab0dd585 100644
--- a/tests/auto/qmltest/rectangle/CMakeLists.txt
+++ b/tests/auto/qmltest/rectangle/CMakeLists.txt
@@ -4,7 +4,7 @@
## rectangle Test:
#####################################################################
-add_qt_test(rectangle
+qt_add_test(rectangle
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/selftests/CMakeLists.txt b/tests/auto/qmltest/selftests/CMakeLists.txt
index 7c2cbbfccc..f37053982c 100644
--- a/tests/auto/qmltest/selftests/CMakeLists.txt
+++ b/tests/auto/qmltest/selftests/CMakeLists.txt
@@ -4,7 +4,7 @@
## selftests Test:
#####################################################################
-add_qt_test(selftests
+qt_add_test(selftests
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/shadersource/CMakeLists.txt b/tests/auto/qmltest/shadersource/CMakeLists.txt
index 7f048f59be..169dfd6719 100644
--- a/tests/auto/qmltest/shadersource/CMakeLists.txt
+++ b/tests/auto/qmltest/shadersource/CMakeLists.txt
@@ -4,7 +4,7 @@
## shadersource Test:
#####################################################################
-add_qt_test(shadersource
+qt_add_test(shadersource
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/stability/CMakeLists.txt b/tests/auto/qmltest/stability/CMakeLists.txt
index 3f3874b4d1..1f0d780403 100644
--- a/tests/auto/qmltest/stability/CMakeLists.txt
+++ b/tests/auto/qmltest/stability/CMakeLists.txt
@@ -4,7 +4,7 @@
## stability Test:
#####################################################################
-add_qt_test(stability
+qt_add_test(stability
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/statemachine/CMakeLists.txt b/tests/auto/qmltest/statemachine/CMakeLists.txt
index 604684952a..fafaf382d8 100644
--- a/tests/auto/qmltest/statemachine/CMakeLists.txt
+++ b/tests/auto/qmltest/statemachine/CMakeLists.txt
@@ -4,7 +4,7 @@
## statemachine Test:
#####################################################################
-add_qt_test(statemachine
+qt_add_test(statemachine
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/text/CMakeLists.txt b/tests/auto/qmltest/text/CMakeLists.txt
index d1c1e84d00..8c25292dbd 100644
--- a/tests/auto/qmltest/text/CMakeLists.txt
+++ b/tests/auto/qmltest/text/CMakeLists.txt
@@ -4,7 +4,7 @@
## text Test:
#####################################################################
-add_qt_test(text
+qt_add_test(text
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/textedit/CMakeLists.txt b/tests/auto/qmltest/textedit/CMakeLists.txt
index c3027d6f66..7f257c6123 100644
--- a/tests/auto/qmltest/textedit/CMakeLists.txt
+++ b/tests/auto/qmltest/textedit/CMakeLists.txt
@@ -4,7 +4,7 @@
## textedit Test:
#####################################################################
-add_qt_test(textedit
+qt_add_test(textedit
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/textinput/CMakeLists.txt b/tests/auto/qmltest/textinput/CMakeLists.txt
index ff1b3b5654..07df991c58 100644
--- a/tests/auto/qmltest/textinput/CMakeLists.txt
+++ b/tests/auto/qmltest/textinput/CMakeLists.txt
@@ -4,7 +4,7 @@
## textinput Test:
#####################################################################
-add_qt_test(textinput
+qt_add_test(textinput
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/qmltest/window/CMakeLists.txt b/tests/auto/qmltest/window/CMakeLists.txt
index dfd262ab27..584b182713 100644
--- a/tests/auto/qmltest/window/CMakeLists.txt
+++ b/tests/auto/qmltest/window/CMakeLists.txt
@@ -4,7 +4,7 @@
## window Test:
#####################################################################
-add_qt_test(window
+qt_add_test(window
GUI
QMLTEST
PUBLIC_LIBRARIES
diff --git a/tests/auto/quick/drawingmodes/CMakeLists.txt b/tests/auto/quick/drawingmodes/CMakeLists.txt
index 168d2b918e..79600f8faf 100644
--- a/tests/auto/quick/drawingmodes/CMakeLists.txt
+++ b/tests/auto/quick/drawingmodes/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_drawingmodes
+qt_add_test(tst_drawingmodes
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_drawingmodes.cpp
@@ -31,12 +31,12 @@ add_qt_test(tst_drawingmodes
## Scopes:
#####################################################################
-extend_target(tst_drawingmodes CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_drawingmodes CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_drawingmodes CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_drawingmodes CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/examples/CMakeLists.txt b/tests/auto/quick/examples/CMakeLists.txt
index 339b72dbe3..ec5c67ad15 100644
--- a/tests/auto/quick/examples/CMakeLists.txt
+++ b/tests/auto/quick/examples/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_examples Test:
#####################################################################
-add_qt_test(tst_examples
+qt_add_test(tst_examples
SOURCES
tst_examples.cpp
DEFINES
diff --git a/tests/auto/quick/geometry/CMakeLists.txt b/tests/auto/quick/geometry/CMakeLists.txt
index c017ffc3d5..14678773b9 100644
--- a/tests/auto/quick/geometry/CMakeLists.txt
+++ b/tests/auto/quick/geometry/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_geometry Test:
#####################################################################
-add_qt_test(tst_geometry
+qt_add_test(tst_geometry
SOURCES
tst_geometry.cpp
LIBRARIES
diff --git a/tests/auto/quick/nodes/CMakeLists.txt b/tests/auto/quick/nodes/CMakeLists.txt
index a971539c63..f0b52003cf 100644
--- a/tests/auto/quick/nodes/CMakeLists.txt
+++ b/tests/auto/quick/nodes/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_nodestest Test:
#####################################################################
-add_qt_test(tst_nodestest
+qt_add_test(tst_nodestest
SOURCES
tst_nodestest.cpp
LIBRARIES
diff --git a/tests/auto/quick/nokeywords/CMakeLists.txt b/tests/auto/quick/nokeywords/CMakeLists.txt
index 78e1604b12..1158d2cf4a 100644
--- a/tests/auto/quick/nokeywords/CMakeLists.txt
+++ b/tests/auto/quick/nokeywords/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_nokeywords Test:
#####################################################################
-add_qt_test(tst_nokeywords
+qt_add_test(tst_nokeywords
SOURCES
tst_nokeywords.cpp
LIBRARIES
diff --git a/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt b/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt
index ef495e7844..3e2c17364a 100644
--- a/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt
+++ b/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_flickableinterop
+qt_add_test(tst_flickableinterop
SOURCES
../../../shared/util.cpp ../../../shared/util.h
../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h
@@ -39,12 +39,12 @@ add_qt_test(tst_flickableinterop
## Scopes:
#####################################################################
-extend_target(tst_flickableinterop CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_flickableinterop CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_flickableinterop CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_flickableinterop CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt
index a6ff5adab4..f9eda5cac2 100644
--- a/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt
+++ b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_multipointtoucharea_interop
+qt_add_test(tst_multipointtoucharea_interop
SOURCES
../../../shared/util.cpp ../../../shared/util.h
../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h
@@ -39,12 +39,12 @@ add_qt_test(tst_multipointtoucharea_interop
## Scopes:
#####################################################################
-extend_target(tst_multipointtoucharea_interop CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_multipointtoucharea_interop CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_multipointtoucharea_interop CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_multipointtoucharea_interop CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt
index 2db5a70c03..114c4faa12 100644
--- a/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt
+++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickdraghandler
+qt_add_test(tst_qquickdraghandler
SOURCES
../../../shared/util.cpp ../../../shared/util.h
../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h
@@ -39,12 +39,12 @@ add_qt_test(tst_qquickdraghandler
## Scopes:
#####################################################################
-extend_target(tst_qquickdraghandler CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickdraghandler CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickdraghandler CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickdraghandler CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt
index b7e2983b73..90a3f848f2 100644
--- a/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt
+++ b/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickhoverhandler
+qt_add_test(tst_qquickhoverhandler
SOURCES
../../../shared/util.cpp ../../../shared/util.h
../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h
@@ -39,12 +39,12 @@ add_qt_test(tst_qquickhoverhandler
## Scopes:
#####################################################################
-extend_target(tst_qquickhoverhandler CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickhoverhandler CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickhoverhandler CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickhoverhandler CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt
index edcc3cd7c3..f2eeab2ea9 100644
--- a/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt
+++ b/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickpinchhandler
+qt_add_test(tst_qquickpinchhandler
SOURCES
../../../shared/util.cpp ../../../shared/util.h
../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h
@@ -39,12 +39,12 @@ add_qt_test(tst_qquickpinchhandler
## Scopes:
#####################################################################
-extend_target(tst_qquickpinchhandler CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickpinchhandler CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickpinchhandler CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickpinchhandler CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt
index d05c3067d3..b7d94b2e97 100644
--- a/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt
+++ b/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickpointerhandler
+qt_add_test(tst_qquickpointerhandler
SOURCES
../../../shared/util.cpp ../../../shared/util.h
../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h
@@ -36,12 +36,12 @@ add_qt_test(tst_qquickpointerhandler
## Scopes:
#####################################################################
-extend_target(tst_qquickpointerhandler CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickpointerhandler CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickpointerhandler CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickpointerhandler CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt
index 5db27144bf..fc2fe64393 100644
--- a/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt
+++ b/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickpointhandler
+qt_add_test(tst_qquickpointhandler
SOURCES
../../../shared/util.cpp ../../../shared/util.h
../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h
@@ -39,12 +39,12 @@ add_qt_test(tst_qquickpointhandler
## Scopes:
#####################################################################
-extend_target(tst_qquickpointhandler CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickpointhandler CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickpointhandler CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickpointhandler CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt
index c57a77725e..8e0353f717 100644
--- a/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt
+++ b/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquicktaphandler
+qt_add_test(tst_qquicktaphandler
SOURCES
../../../shared/util.cpp ../../../shared/util.h
../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h
@@ -36,12 +36,12 @@ add_qt_test(tst_qquicktaphandler
## Scopes:
#####################################################################
-extend_target(tst_qquicktaphandler CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquicktaphandler CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquicktaphandler CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquicktaphandler CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt
index 222c985ce7..b8432c10b5 100644
--- a/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt
+++ b/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickwheelhandler
+qt_add_test(tst_qquickwheelhandler
SOURCES
../../../shared/util.cpp ../../../shared/util.h
../../shared/geometrytestutil.cpp ../../shared/geometrytestutil.h
@@ -39,12 +39,12 @@ add_qt_test(tst_qquickwheelhandler
## Scopes:
#####################################################################
-extend_target(tst_qquickwheelhandler CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickwheelhandler CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickwheelhandler CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickwheelhandler CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/propertyrequirements/CMakeLists.txt b/tests/auto/quick/propertyrequirements/CMakeLists.txt
index 6eacc6e68b..3c50490bd1 100644
--- a/tests/auto/quick/propertyrequirements/CMakeLists.txt
+++ b/tests/auto/quick/propertyrequirements/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_propertyrequirements Test:
#####################################################################
-add_qt_test(tst_propertyrequirements
+qt_add_test(tst_propertyrequirements
SOURCES
tst_propertyrequirements.cpp
LIBRARIES
diff --git a/tests/auto/quick/qquickaccessible/CMakeLists.txt b/tests/auto/quick/qquickaccessible/CMakeLists.txt
index b2379be093..215d31ca17 100644
--- a/tests/auto/quick/qquickaccessible/CMakeLists.txt
+++ b/tests/auto/quick/qquickaccessible/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickaccessible
+qt_add_test(tst_qquickaccessible
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickaccessible.cpp
@@ -35,12 +35,12 @@ add_qt_test(tst_qquickaccessible
## Scopes:
#####################################################################
-extend_target(tst_qquickaccessible CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickaccessible CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickaccessible CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickaccessible CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickanchors/CMakeLists.txt b/tests/auto/quick/qquickanchors/CMakeLists.txt
index 35a72c411e..62a35d25c5 100644
--- a/tests/auto/quick/qquickanchors/CMakeLists.txt
+++ b/tests/auto/quick/qquickanchors/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickanchors
+qt_add_test(tst_qquickanchors
SOURCES
../../shared/util.cpp ../../shared/util.h
../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -36,12 +36,12 @@ add_qt_test(tst_qquickanchors
## Scopes:
#####################################################################
-extend_target(tst_qquickanchors CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickanchors CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickanchors CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickanchors CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickanimatedimage/CMakeLists.txt b/tests/auto/quick/qquickanimatedimage/CMakeLists.txt
index cb9c578b6a..7b2afa8cb7 100644
--- a/tests/auto/quick/qquickanimatedimage/CMakeLists.txt
+++ b/tests/auto/quick/qquickanimatedimage/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickanimatedimage
+qt_add_test(tst_qquickanimatedimage
SOURCES
../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
../../shared/util.cpp ../../shared/util.h
@@ -33,12 +33,12 @@ add_qt_test(tst_qquickanimatedimage
## Scopes:
#####################################################################
-extend_target(tst_qquickanimatedimage CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickanimatedimage CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickanimatedimage CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickanimatedimage CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt b/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt
index fe7ad609e0..c79009e674 100644
--- a/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt
+++ b/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickanimatedsprite
+qt_add_test(tst_qquickanimatedsprite
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickanimatedsprite.cpp
@@ -36,12 +36,12 @@ add_qt_test(tst_qquickanimatedsprite
## Scopes:
#####################################################################
-extend_target(tst_qquickanimatedsprite CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickanimatedsprite CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickanimatedsprite CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickanimatedsprite CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickanimationcontroller/CMakeLists.txt b/tests/auto/quick/qquickanimationcontroller/CMakeLists.txt
index e0ac399cd4..e5822e77e3 100644
--- a/tests/auto/quick/qquickanimationcontroller/CMakeLists.txt
+++ b/tests/auto/quick/qquickanimationcontroller/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickanimationcontroller
+qt_add_test(tst_qquickanimationcontroller
GUI
QMLTEST
SOURCES
diff --git a/tests/auto/quick/qquickanimations/CMakeLists.txt b/tests/auto/quick/qquickanimations/CMakeLists.txt
index 6a2541a247..cdd599c8e0 100644
--- a/tests/auto/quick/qquickanimations/CMakeLists.txt
+++ b/tests/auto/quick/qquickanimations/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickanimations
+qt_add_test(tst_qquickanimations
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickanimations.cpp
@@ -38,12 +38,12 @@ add_qt_test(tst_qquickanimations
## Scopes:
#####################################################################
-extend_target(tst_qquickanimations CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickanimations CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickanimations CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickanimations CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickanimators/CMakeLists.txt b/tests/auto/quick/qquickanimators/CMakeLists.txt
index 428073f0dc..969c1ef398 100644
--- a/tests/auto/quick/qquickanimators/CMakeLists.txt
+++ b/tests/auto/quick/qquickanimators/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qquickanimators Test:
#####################################################################
-add_qt_test(tst_qquickanimators
+qt_add_test(tst_qquickanimators
SOURCES
tst_qquickanimators.cpp
LIBRARIES
diff --git a/tests/auto/quick/qquickapplication/CMakeLists.txt b/tests/auto/quick/qquickapplication/CMakeLists.txt
index a7a2f4157d..e0c95a46b3 100644
--- a/tests/auto/quick/qquickapplication/CMakeLists.txt
+++ b/tests/auto/quick/qquickapplication/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickapplication
+qt_add_test(tst_qquickapplication
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickapplication.cpp
@@ -34,12 +34,12 @@ add_qt_test(tst_qquickapplication
## Scopes:
#####################################################################
-extend_target(tst_qquickapplication CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickapplication CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickapplication CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickapplication CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickbehaviors/CMakeLists.txt b/tests/auto/quick/qquickbehaviors/CMakeLists.txt
index 5894ac2774..a311447fb4 100644
--- a/tests/auto/quick/qquickbehaviors/CMakeLists.txt
+++ b/tests/auto/quick/qquickbehaviors/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickbehaviors
+qt_add_test(tst_qquickbehaviors
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickbehaviors.cpp
@@ -34,12 +34,12 @@ add_qt_test(tst_qquickbehaviors
## Scopes:
#####################################################################
-extend_target(tst_qquickbehaviors CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickbehaviors CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickbehaviors CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickbehaviors CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickborderimage/CMakeLists.txt b/tests/auto/quick/qquickborderimage/CMakeLists.txt
index 07fe7a1339..503f64fa01 100644
--- a/tests/auto/quick/qquickborderimage/CMakeLists.txt
+++ b/tests/auto/quick/qquickborderimage/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickborderimage
+qt_add_test(tst_qquickborderimage
SOURCES
../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
../../shared/util.cpp ../../shared/util.h
@@ -38,12 +38,12 @@ add_qt_test(tst_qquickborderimage
## Scopes:
#####################################################################
-extend_target(tst_qquickborderimage CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickborderimage CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickborderimage CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickborderimage CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickboundaryrule/CMakeLists.txt b/tests/auto/quick/qquickboundaryrule/CMakeLists.txt
index 8d6c8910aa..c9605ad952 100644
--- a/tests/auto/quick/qquickboundaryrule/CMakeLists.txt
+++ b/tests/auto/quick/qquickboundaryrule/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickboundaryrule
+qt_add_test(tst_qquickboundaryrule
SOURCES
../../shared/util.cpp ../../shared/util.h
../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -36,12 +36,12 @@ add_qt_test(tst_qquickboundaryrule
## Scopes:
#####################################################################
-extend_target(tst_qquickboundaryrule CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickboundaryrule CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickboundaryrule CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickboundaryrule CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickcanvasitem/CMakeLists.txt b/tests/auto/quick/qquickcanvasitem/CMakeLists.txt
index b695355359..67e0f98564 100644
--- a/tests/auto/quick/qquickcanvasitem/CMakeLists.txt
+++ b/tests/auto/quick/qquickcanvasitem/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickcanvasitem
+qt_add_test(tst_qquickcanvasitem
GUI
QMLTEST
SOURCES
@@ -32,7 +32,7 @@ add_qt_test(tst_qquickcanvasitem
## Scopes:
#####################################################################
-extend_target(tst_qquickcanvasitem CONDITION EXISTS _ss_[QT_INSTALL_PLUGINS]/imageformats
+qt_extend_target(tst_qquickcanvasitem CONDITION EXISTS _ss_[QT_INSTALL_PLUGINS]/imageformats
DEFINES
HAS_IMAGE_FORMATS
)
diff --git a/tests/auto/quick/qquickdesignersupport/CMakeLists.txt b/tests/auto/quick/qquickdesignersupport/CMakeLists.txt
index 87492ff436..b7d26c43fb 100644
--- a/tests/auto/quick/qquickdesignersupport/CMakeLists.txt
+++ b/tests/auto/quick/qquickdesignersupport/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickdesignersupport
+qt_add_test(tst_qquickdesignersupport
SOURCES
../../shared/util.cpp ../../shared/util.h
../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -39,12 +39,12 @@ add_qt_test(tst_qquickdesignersupport
## Scopes:
#####################################################################
-extend_target(tst_qquickdesignersupport CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickdesignersupport CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickdesignersupport CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickdesignersupport CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickdrag/CMakeLists.txt b/tests/auto/quick/qquickdrag/CMakeLists.txt
index ad077411c2..cb4e82a73e 100644
--- a/tests/auto/quick/qquickdrag/CMakeLists.txt
+++ b/tests/auto/quick/qquickdrag/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qquickdrag Test:
#####################################################################
-add_qt_test(tst_qquickdrag
+qt_add_test(tst_qquickdrag
SOURCES
tst_qquickdrag.cpp
LIBRARIES
diff --git a/tests/auto/quick/qquickdroparea/CMakeLists.txt b/tests/auto/quick/qquickdroparea/CMakeLists.txt
index ea66f99c0c..85353502b1 100644
--- a/tests/auto/quick/qquickdroparea/CMakeLists.txt
+++ b/tests/auto/quick/qquickdroparea/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickdroparea
+qt_add_test(tst_qquickdroparea
SOURCES
../../shared/util.cpp ../../shared/util.h
../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -40,12 +40,12 @@ add_qt_test(tst_qquickdroparea
## Scopes:
#####################################################################
-extend_target(tst_qquickdroparea CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickdroparea CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickdroparea CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickdroparea CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt b/tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt
index f56593b245..82638f0624 100644
--- a/tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt
+++ b/tests/auto/quick/qquickdynamicpropertyanimation/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickdynamicpropertyanimation
+qt_add_test(tst_qquickdynamicpropertyanimation
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickdynamicpropertyanimation.cpp
@@ -26,12 +26,12 @@ add_qt_test(tst_qquickdynamicpropertyanimation
## Scopes:
#####################################################################
-extend_target(tst_qquickdynamicpropertyanimation CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickdynamicpropertyanimation CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickdynamicpropertyanimation CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickdynamicpropertyanimation CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickflickable/CMakeLists.txt b/tests/auto/quick/qquickflickable/CMakeLists.txt
index 43ec4cd14d..1284e574c9 100644
--- a/tests/auto/quick/qquickflickable/CMakeLists.txt
+++ b/tests/auto/quick/qquickflickable/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickflickable
+qt_add_test(tst_qquickflickable
SOURCES
../../shared/util.cpp ../../shared/util.h
../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -36,12 +36,12 @@ add_qt_test(tst_qquickflickable
## Scopes:
#####################################################################
-extend_target(tst_qquickflickable CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickflickable CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickflickable CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickflickable CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickflipable/CMakeLists.txt b/tests/auto/quick/qquickflipable/CMakeLists.txt
index 42d3e5516e..99489be92f 100644
--- a/tests/auto/quick/qquickflipable/CMakeLists.txt
+++ b/tests/auto/quick/qquickflipable/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickflipable
+qt_add_test(tst_qquickflipable
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickflipable.cpp
@@ -31,12 +31,12 @@ add_qt_test(tst_qquickflipable
## Scopes:
#####################################################################
-extend_target(tst_qquickflipable CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickflipable CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickflipable CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickflipable CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickfocusscope/CMakeLists.txt b/tests/auto/quick/qquickfocusscope/CMakeLists.txt
index 3d13e0b9e0..ae829dd9e0 100644
--- a/tests/auto/quick/qquickfocusscope/CMakeLists.txt
+++ b/tests/auto/quick/qquickfocusscope/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickfocusscope
+qt_add_test(tst_qquickfocusscope
SOURCES
../../shared/util.cpp ../../shared/util.h
../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -36,12 +36,12 @@ add_qt_test(tst_qquickfocusscope
## Scopes:
#####################################################################
-extend_target(tst_qquickfocusscope CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickfocusscope CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickfocusscope CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickfocusscope CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickfontloader/CMakeLists.txt b/tests/auto/quick/qquickfontloader/CMakeLists.txt
index 44dcfdad0a..50a9a3488b 100644
--- a/tests/auto/quick/qquickfontloader/CMakeLists.txt
+++ b/tests/auto/quick/qquickfontloader/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickfontloader
+qt_add_test(tst_qquickfontloader
SOURCES
../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
../../shared/util.cpp ../../shared/util.h
@@ -33,12 +33,12 @@ add_qt_test(tst_qquickfontloader
## Scopes:
#####################################################################
-extend_target(tst_qquickfontloader CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickfontloader CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickfontloader CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickfontloader CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickfontloader_static/CMakeLists.txt b/tests/auto/quick/qquickfontloader_static/CMakeLists.txt
index 0ddf042334..f0b157b517 100644
--- a/tests/auto/quick/qquickfontloader_static/CMakeLists.txt
+++ b/tests/auto/quick/qquickfontloader_static/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickfontloader_static
+qt_add_test(tst_qquickfontloader_static
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickfontloader_static.cpp
@@ -34,12 +34,12 @@ add_qt_test(tst_qquickfontloader_static
## Scopes:
#####################################################################
-extend_target(tst_qquickfontloader_static CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickfontloader_static CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickfontloader_static CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickfontloader_static CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickfontmetrics/CMakeLists.txt b/tests/auto/quick/qquickfontmetrics/CMakeLists.txt
index 6cab5d6550..3f79973de5 100644
--- a/tests/auto/quick/qquickfontmetrics/CMakeLists.txt
+++ b/tests/auto/quick/qquickfontmetrics/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_quickfontmetrics Test:
#####################################################################
-add_qt_test(tst_quickfontmetrics
+qt_add_test(tst_quickfontmetrics
SOURCES
tst_quickfontmetrics.cpp
LIBRARIES
diff --git a/tests/auto/quick/qquickframebufferobject/CMakeLists.txt b/tests/auto/quick/qquickframebufferobject/CMakeLists.txt
index d58a100884..0f04723557 100644
--- a/tests/auto/quick/qquickframebufferobject/CMakeLists.txt
+++ b/tests/auto/quick/qquickframebufferobject/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickframebufferobject
+qt_add_test(tst_qquickframebufferobject
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickframebufferobject.cpp
@@ -28,12 +28,12 @@ add_qt_test(tst_qquickframebufferobject
## Scopes:
#####################################################################
-extend_target(tst_qquickframebufferobject CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickframebufferobject CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickframebufferobject CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickframebufferobject CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt b/tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt
index 6de5162b10..0393d805e6 100644
--- a/tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt
+++ b/tests/auto/quick/qquickgraphicsinfo/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickgraphicsinfo
+qt_add_test(tst_qquickgraphicsinfo
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickgraphicsinfo.cpp
@@ -28,12 +28,12 @@ add_qt_test(tst_qquickgraphicsinfo
## Scopes:
#####################################################################
-extend_target(tst_qquickgraphicsinfo CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickgraphicsinfo CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickgraphicsinfo CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickgraphicsinfo CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickgridview/CMakeLists.txt b/tests/auto/quick/qquickgridview/CMakeLists.txt
index 885ef9eae4..8880b57d24 100644
--- a/tests/auto/quick/qquickgridview/CMakeLists.txt
+++ b/tests/auto/quick/qquickgridview/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickgridview
+qt_add_test(tst_qquickgridview
SOURCES
../../shared/util.cpp ../../shared/util.h
../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -42,12 +42,12 @@ add_qt_test(tst_qquickgridview
## Scopes:
#####################################################################
-extend_target(tst_qquickgridview CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickgridview CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickgridview CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickgridview CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickimage/CMakeLists.txt b/tests/auto/quick/qquickimage/CMakeLists.txt
index 9c519290ce..e18d4d47fb 100644
--- a/tests/auto/quick/qquickimage/CMakeLists.txt
+++ b/tests/auto/quick/qquickimage/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickimage
+qt_add_test(tst_qquickimage
SOURCES
../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
../../shared/util.cpp ../../shared/util.h
@@ -38,12 +38,12 @@ add_qt_test(tst_qquickimage
## Scopes:
#####################################################################
-extend_target(tst_qquickimage CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickimage CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickimage CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickimage CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickimageprovider/CMakeLists.txt b/tests/auto/quick/qquickimageprovider/CMakeLists.txt
index d81a845a02..80826d35fc 100644
--- a/tests/auto/quick/qquickimageprovider/CMakeLists.txt
+++ b/tests/auto/quick/qquickimageprovider/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qquickimageprovider Test:
#####################################################################
-add_qt_test(tst_qquickimageprovider
+qt_add_test(tst_qquickimageprovider
SOURCES
tst_qquickimageprovider.cpp
LIBRARIES
diff --git a/tests/auto/quick/qquickitem/CMakeLists.txt b/tests/auto/quick/qquickitem/CMakeLists.txt
index e78d7d7b40..af18dca7a2 100644
--- a/tests/auto/quick/qquickitem/CMakeLists.txt
+++ b/tests/auto/quick/qquickitem/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickitem
+qt_add_test(tst_qquickitem
SOURCES
../../shared/util.cpp ../../shared/util.h
../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -36,19 +36,19 @@ add_qt_test(tst_qquickitem
## Scopes:
#####################################################################
-extend_target(tst_qquickitem CONDITION TARGET Qt::Widgets
+qt_extend_target(tst_qquickitem CONDITION TARGET Qt::Widgets
DEFINES
TEST_QTBUG_60123
PUBLIC_LIBRARIES
Qt::Widgets
)
-extend_target(tst_qquickitem CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickitem CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickitem CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickitem CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickitem2/CMakeLists.txt b/tests/auto/quick/qquickitem2/CMakeLists.txt
index 1555ad6cef..ea6040831e 100644
--- a/tests/auto/quick/qquickitem2/CMakeLists.txt
+++ b/tests/auto/quick/qquickitem2/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickitem2
+qt_add_test(tst_qquickitem2
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickitem.cpp
@@ -31,12 +31,12 @@ add_qt_test(tst_qquickitem2
## Scopes:
#####################################################################
-extend_target(tst_qquickitem2 CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickitem2 CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickitem2 CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickitem2 CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickitemlayer/CMakeLists.txt b/tests/auto/quick/qquickitemlayer/CMakeLists.txt
index a03a0d3478..bc145ae48b 100644
--- a/tests/auto/quick/qquickitemlayer/CMakeLists.txt
+++ b/tests/auto/quick/qquickitemlayer/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickitemlayer
+qt_add_test(tst_qquickitemlayer
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickitemlayer.cpp
@@ -34,12 +34,12 @@ add_qt_test(tst_qquickitemlayer
## Scopes:
#####################################################################
-extend_target(tst_qquickitemlayer CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickitemlayer CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickitemlayer CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickitemlayer CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquicklayouts/CMakeLists.txt b/tests/auto/quick/qquicklayouts/CMakeLists.txt
index 1c515786a2..c3960001c0 100644
--- a/tests/auto/quick/qquicklayouts/CMakeLists.txt
+++ b/tests/auto/quick/qquicklayouts/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquicklayouts
+qt_add_test(tst_qquicklayouts
GUI
QMLTEST
SOURCES
diff --git a/tests/auto/quick/qquicklistview/CMakeLists.txt b/tests/auto/quick/qquicklistview/CMakeLists.txt
index 7c809d8c29..c2083c4876 100644
--- a/tests/auto/quick/qquicklistview/CMakeLists.txt
+++ b/tests/auto/quick/qquicklistview/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquicklistview
+qt_add_test(tst_qquicklistview
SOURCES
../../shared/util.cpp ../../shared/util.h
../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -46,12 +46,12 @@ add_qt_test(tst_qquicklistview
## Scopes:
#####################################################################
-extend_target(tst_qquicklistview CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquicklistview CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquicklistview CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquicklistview CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickloader/CMakeLists.txt b/tests/auto/quick/qquickloader/CMakeLists.txt
index a92ea61df5..a373976d6d 100644
--- a/tests/auto/quick/qquickloader/CMakeLists.txt
+++ b/tests/auto/quick/qquickloader/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickloader
+qt_add_test(tst_qquickloader
SOURCES
../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
../../shared/util.cpp ../../shared/util.h
@@ -38,12 +38,12 @@ add_qt_test(tst_qquickloader
## Scopes:
#####################################################################
-extend_target(tst_qquickloader CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickloader CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickloader CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickloader CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickmousearea/CMakeLists.txt b/tests/auto/quick/qquickmousearea/CMakeLists.txt
index bb60a32d8b..79d749cae4 100644
--- a/tests/auto/quick/qquickmousearea/CMakeLists.txt
+++ b/tests/auto/quick/qquickmousearea/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickmousearea
+qt_add_test(tst_qquickmousearea
SOURCES
../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
../../shared/util.cpp ../../shared/util.h
@@ -41,12 +41,12 @@ add_qt_test(tst_qquickmousearea
## Scopes:
#####################################################################
-extend_target(tst_qquickmousearea CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickmousearea CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickmousearea CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickmousearea CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt b/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt
index bb3ae58ab3..97861b99f5 100644
--- a/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt
+++ b/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickmultipointtoucharea
+qt_add_test(tst_qquickmultipointtoucharea
SOURCES
../../shared/util.cpp ../../shared/util.h
../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -36,12 +36,12 @@ add_qt_test(tst_qquickmultipointtoucharea
## Scopes:
#####################################################################
-extend_target(tst_qquickmultipointtoucharea CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickmultipointtoucharea CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickmultipointtoucharea CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickmultipointtoucharea CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickopenglinfo/CMakeLists.txt b/tests/auto/quick/qquickopenglinfo/CMakeLists.txt
index bf366c2b7c..c0bc92c73f 100644
--- a/tests/auto/quick/qquickopenglinfo/CMakeLists.txt
+++ b/tests/auto/quick/qquickopenglinfo/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickopenglinfo
+qt_add_test(tst_qquickopenglinfo
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickopenglinfo.cpp
@@ -28,12 +28,12 @@ add_qt_test(tst_qquickopenglinfo
## Scopes:
#####################################################################
-extend_target(tst_qquickopenglinfo CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickopenglinfo CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickopenglinfo CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickopenglinfo CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickpainteditem/CMakeLists.txt b/tests/auto/quick/qquickpainteditem/CMakeLists.txt
index fd528006b0..ed5ce75b31 100644
--- a/tests/auto/quick/qquickpainteditem/CMakeLists.txt
+++ b/tests/auto/quick/qquickpainteditem/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qquickpainteditem Test:
#####################################################################
-add_qt_test(tst_qquickpainteditem
+qt_add_test(tst_qquickpainteditem
SOURCES
tst_qquickpainteditem.cpp
LIBRARIES
diff --git a/tests/auto/quick/qquickpath/CMakeLists.txt b/tests/auto/quick/qquickpath/CMakeLists.txt
index cf7d7740ac..98e24e9864 100644
--- a/tests/auto/quick/qquickpath/CMakeLists.txt
+++ b/tests/auto/quick/qquickpath/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickpath
+qt_add_test(tst_qquickpath
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickpath.cpp
@@ -34,12 +34,12 @@ add_qt_test(tst_qquickpath
## Scopes:
#####################################################################
-extend_target(tst_qquickpath CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickpath CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickpath CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickpath CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickpathview/CMakeLists.txt b/tests/auto/quick/qquickpathview/CMakeLists.txt
index a9b2bfb1af..8f9622963f 100644
--- a/tests/auto/quick/qquickpathview/CMakeLists.txt
+++ b/tests/auto/quick/qquickpathview/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickpathview
+qt_add_test(tst_qquickpathview
SOURCES
../../shared/util.cpp ../../shared/util.h
../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -39,17 +39,17 @@ add_qt_test(tst_qquickpathview
## Scopes:
#####################################################################
-extend_target(tst_qquickpathview CONDITION TARGET Qt::Widgets
+qt_extend_target(tst_qquickpathview CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)
-extend_target(tst_qquickpathview CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickpathview CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickpathview CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickpathview CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickpincharea/CMakeLists.txt b/tests/auto/quick/qquickpincharea/CMakeLists.txt
index 07a3768684..3d78622048 100644
--- a/tests/auto/quick/qquickpincharea/CMakeLists.txt
+++ b/tests/auto/quick/qquickpincharea/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickpincharea
+qt_add_test(tst_qquickpincharea
SOURCES
../../shared/util.cpp ../../shared/util.h
../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -36,12 +36,12 @@ add_qt_test(tst_qquickpincharea
## Scopes:
#####################################################################
-extend_target(tst_qquickpincharea CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickpincharea CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickpincharea CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickpincharea CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickpixmapcache/CMakeLists.txt b/tests/auto/quick/qquickpixmapcache/CMakeLists.txt
index 7064dc9ce5..7cecf3e8db 100644
--- a/tests/auto/quick/qquickpixmapcache/CMakeLists.txt
+++ b/tests/auto/quick/qquickpixmapcache/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickpixmapcache
+qt_add_test(tst_qquickpixmapcache
SOURCES
../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
../../shared/util.cpp ../../shared/util.h
@@ -34,12 +34,12 @@ add_qt_test(tst_qquickpixmapcache
## Scopes:
#####################################################################
-extend_target(tst_qquickpixmapcache CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickpixmapcache CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickpixmapcache CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickpixmapcache CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickpositioners/CMakeLists.txt b/tests/auto/quick/qquickpositioners/CMakeLists.txt
index 3a5aa6aa5f..47093891da 100644
--- a/tests/auto/quick/qquickpositioners/CMakeLists.txt
+++ b/tests/auto/quick/qquickpositioners/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickpositioners
+qt_add_test(tst_qquickpositioners
SOURCES
../../shared/util.cpp ../../shared/util.h
../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -37,12 +37,12 @@ add_qt_test(tst_qquickpositioners
## Scopes:
#####################################################################
-extend_target(tst_qquickpositioners CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickpositioners CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickpositioners CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickpositioners CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickrectangle/CMakeLists.txt b/tests/auto/quick/qquickrectangle/CMakeLists.txt
index 5653c08dd3..2ea94e17ba 100644
--- a/tests/auto/quick/qquickrectangle/CMakeLists.txt
+++ b/tests/auto/quick/qquickrectangle/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickrectangle
+qt_add_test(tst_qquickrectangle
SOURCES
../../shared/util.cpp ../../shared/util.h
../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -36,12 +36,12 @@ add_qt_test(tst_qquickrectangle
## Scopes:
#####################################################################
-extend_target(tst_qquickrectangle CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickrectangle CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickrectangle CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickrectangle CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickrepeater/CMakeLists.txt b/tests/auto/quick/qquickrepeater/CMakeLists.txt
index 5863de83ef..75bec8fa5d 100644
--- a/tests/auto/quick/qquickrepeater/CMakeLists.txt
+++ b/tests/auto/quick/qquickrepeater/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickrepeater
+qt_add_test(tst_qquickrepeater
SOURCES
../../shared/util.cpp ../../shared/util.h
../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -38,12 +38,12 @@ add_qt_test(tst_qquickrepeater
## Scopes:
#####################################################################
-extend_target(tst_qquickrepeater CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickrepeater CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickrepeater CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickrepeater CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickscreen/CMakeLists.txt b/tests/auto/quick/qquickscreen/CMakeLists.txt
index c53ed38d28..7b04bb863e 100644
--- a/tests/auto/quick/qquickscreen/CMakeLists.txt
+++ b/tests/auto/quick/qquickscreen/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qquickscreen Test:
#####################################################################
-add_qt_test(tst_qquickscreen
+qt_add_test(tst_qquickscreen
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickscreen.cpp
@@ -24,12 +24,12 @@ add_qt_test(tst_qquickscreen
## Scopes:
#####################################################################
-extend_target(tst_qquickscreen CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickscreen CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickscreen CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickscreen CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickshadereffect/CMakeLists.txt b/tests/auto/quick/qquickshadereffect/CMakeLists.txt
index 11b63af453..c4a3b39cdb 100644
--- a/tests/auto/quick/qquickshadereffect/CMakeLists.txt
+++ b/tests/auto/quick/qquickshadereffect/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qquickshadereffect Test:
#####################################################################
-add_qt_test(tst_qquickshadereffect
+qt_add_test(tst_qquickshadereffect
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickshadereffect.cpp
@@ -24,12 +24,12 @@ add_qt_test(tst_qquickshadereffect
## Scopes:
#####################################################################
-extend_target(tst_qquickshadereffect CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickshadereffect CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickshadereffect CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickshadereffect CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickshape/CMakeLists.txt b/tests/auto/quick/qquickshape/CMakeLists.txt
index 4e31680f7f..409789903b 100644
--- a/tests/auto/quick/qquickshape/CMakeLists.txt
+++ b/tests/auto/quick/qquickshape/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickshape
+qt_add_test(tst_qquickshape
SOURCES
../../shared/util.cpp ../../shared/util.h
../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -41,17 +41,17 @@ add_qt_test(tst_qquickshape
## Scopes:
#####################################################################
-extend_target(tst_qquickshape CONDITION TARGET Qt::Widgets
+qt_extend_target(tst_qquickshape CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)
-extend_target(tst_qquickshape CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickshape CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickshape CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickshape CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickshortcut/CMakeLists.txt b/tests/auto/quick/qquickshortcut/CMakeLists.txt
index 42b69b9587..8bad39e70c 100644
--- a/tests/auto/quick/qquickshortcut/CMakeLists.txt
+++ b/tests/auto/quick/qquickshortcut/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickshortcut
+qt_add_test(tst_qquickshortcut
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickshortcut.cpp
@@ -26,17 +26,17 @@ add_qt_test(tst_qquickshortcut
## Scopes:
#####################################################################
-extend_target(tst_qquickshortcut CONDITION TARGET Qt::Widgets
+qt_extend_target(tst_qquickshortcut CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::QuickWidgets
)
-extend_target(tst_qquickshortcut CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickshortcut CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickshortcut CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickshortcut CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt b/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt
index 837160e69b..8e7d6d538b 100644
--- a/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt
+++ b/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquicksmoothedanimation
+qt_add_test(tst_qquicksmoothedanimation
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquicksmoothedanimation.cpp
@@ -31,12 +31,12 @@ add_qt_test(tst_qquicksmoothedanimation
## Scopes:
#####################################################################
-extend_target(tst_qquicksmoothedanimation CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquicksmoothedanimation CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquicksmoothedanimation CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquicksmoothedanimation CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickspringanimation/CMakeLists.txt b/tests/auto/quick/qquickspringanimation/CMakeLists.txt
index 85b53abf9a..3cb4b781d5 100644
--- a/tests/auto/quick/qquickspringanimation/CMakeLists.txt
+++ b/tests/auto/quick/qquickspringanimation/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickspringanimation
+qt_add_test(tst_qquickspringanimation
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickspringanimation.cpp
@@ -31,12 +31,12 @@ add_qt_test(tst_qquickspringanimation
## Scopes:
#####################################################################
-extend_target(tst_qquickspringanimation CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickspringanimation CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickspringanimation CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickspringanimation CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickspritesequence/CMakeLists.txt b/tests/auto/quick/qquickspritesequence/CMakeLists.txt
index f40680742a..0fcb643b45 100644
--- a/tests/auto/quick/qquickspritesequence/CMakeLists.txt
+++ b/tests/auto/quick/qquickspritesequence/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickspritesequence
+qt_add_test(tst_qquickspritesequence
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickspritesequence.cpp
@@ -32,12 +32,12 @@ add_qt_test(tst_qquickspritesequence
## Scopes:
#####################################################################
-extend_target(tst_qquickspritesequence CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickspritesequence CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickspritesequence CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickspritesequence CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickstates/CMakeLists.txt b/tests/auto/quick/qquickstates/CMakeLists.txt
index 7494cfb97f..d33ea3a444 100644
--- a/tests/auto/quick/qquickstates/CMakeLists.txt
+++ b/tests/auto/quick/qquickstates/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickstates
+qt_add_test(tst_qquickstates
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickstates.cpp
@@ -31,12 +31,12 @@ add_qt_test(tst_qquickstates
## Scopes:
#####################################################################
-extend_target(tst_qquickstates CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickstates CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickstates CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickstates CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickstyledtext/CMakeLists.txt b/tests/auto/quick/qquickstyledtext/CMakeLists.txt
index 0d0808969a..e8158b803a 100644
--- a/tests/auto/quick/qquickstyledtext/CMakeLists.txt
+++ b/tests/auto/quick/qquickstyledtext/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qquickstyledtext Test:
#####################################################################
-add_qt_test(tst_qquickstyledtext
+qt_add_test(tst_qquickstyledtext
SOURCES
tst_qquickstyledtext.cpp
LIBRARIES
diff --git a/tests/auto/quick/qquicksystempalette/CMakeLists.txt b/tests/auto/quick/qquicksystempalette/CMakeLists.txt
index 53287a6d0c..b3033929b7 100644
--- a/tests/auto/quick/qquicksystempalette/CMakeLists.txt
+++ b/tests/auto/quick/qquicksystempalette/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qquicksystempalette Test:
#####################################################################
-add_qt_test(tst_qquicksystempalette
+qt_add_test(tst_qquicksystempalette
SOURCES
tst_qquicksystempalette.cpp
LIBRARIES
@@ -21,7 +21,7 @@ add_qt_test(tst_qquicksystempalette
## Scopes:
#####################################################################
-extend_target(tst_qquicksystempalette CONDITION TARGET Qt::Widgets
+qt_extend_target(tst_qquicksystempalette CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)
diff --git a/tests/auto/quick/qquicktableview/CMakeLists.txt b/tests/auto/quick/qquicktableview/CMakeLists.txt
index 773a166473..d77b99869a 100644
--- a/tests/auto/quick/qquicktableview/CMakeLists.txt
+++ b/tests/auto/quick/qquicktableview/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquicktableview
+qt_add_test(tst_qquicktableview
SOURCES
../../shared/util.cpp ../../shared/util.h
../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -40,12 +40,12 @@ add_qt_test(tst_qquicktableview
## Scopes:
#####################################################################
-extend_target(tst_qquicktableview CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquicktableview CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquicktableview CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquicktableview CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquicktext/CMakeLists.txt b/tests/auto/quick/qquicktext/CMakeLists.txt
index 7148567a25..60068d5c3e 100644
--- a/tests/auto/quick/qquicktext/CMakeLists.txt
+++ b/tests/auto/quick/qquicktext/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquicktext
+qt_add_test(tst_qquicktext
SOURCES
../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
../../shared/util.cpp ../../shared/util.h
@@ -34,12 +34,12 @@ add_qt_test(tst_qquicktext
## Scopes:
#####################################################################
-extend_target(tst_qquicktext CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquicktext CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquicktext CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquicktext CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquicktextdocument/CMakeLists.txt b/tests/auto/quick/qquicktextdocument/CMakeLists.txt
index 5b23371191..116ac8af22 100644
--- a/tests/auto/quick/qquicktextdocument/CMakeLists.txt
+++ b/tests/auto/quick/qquicktextdocument/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquicktextdocument
+qt_add_test(tst_qquicktextdocument
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquicktextdocument.cpp
@@ -31,12 +31,12 @@ add_qt_test(tst_qquicktextdocument
## Scopes:
#####################################################################
-extend_target(tst_qquicktextdocument CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquicktextdocument CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquicktextdocument CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquicktextdocument CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquicktextedit/CMakeLists.txt b/tests/auto/quick/qquicktextedit/CMakeLists.txt
index cc244983b0..8ce170eec4 100644
--- a/tests/auto/quick/qquicktextedit/CMakeLists.txt
+++ b/tests/auto/quick/qquicktextedit/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquicktextedit
+qt_add_test(tst_qquicktextedit
SOURCES
../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
../../shared/util.cpp ../../shared/util.h
@@ -39,17 +39,17 @@ add_qt_test(tst_qquicktextedit
## Scopes:
#####################################################################
-extend_target(tst_qquicktextedit CONDITION APPLE_OSX
+qt_extend_target(tst_qquicktextedit CONDITION APPLE_OSX
PUBLIC_LIBRARIES
${FWAppKit}
)
-extend_target(tst_qquicktextedit CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquicktextedit CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquicktextedit CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquicktextedit CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquicktextinput/CMakeLists.txt b/tests/auto/quick/qquicktextinput/CMakeLists.txt
index 0901c29b21..a67c7dc226 100644
--- a/tests/auto/quick/qquicktextinput/CMakeLists.txt
+++ b/tests/auto/quick/qquicktextinput/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquicktextinput
+qt_add_test(tst_qquicktextinput
SOURCES
../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
../../shared/util.cpp ../../shared/util.h
@@ -32,17 +32,17 @@ add_qt_test(tst_qquicktextinput
## Scopes:
#####################################################################
-extend_target(tst_qquicktextinput CONDITION APPLE_OSX
+qt_extend_target(tst_qquicktextinput CONDITION APPLE_OSX
PUBLIC_LIBRARIES
${FWAppKit}
)
-extend_target(tst_qquicktextinput CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquicktextinput CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquicktextinput CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquicktextinput CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquicktextmetrics/CMakeLists.txt b/tests/auto/quick/qquicktextmetrics/CMakeLists.txt
index 0fbb74e0a8..8f5001e46c 100644
--- a/tests/auto/quick/qquicktextmetrics/CMakeLists.txt
+++ b/tests/auto/quick/qquicktextmetrics/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qquicktextmetrics Test:
#####################################################################
-add_qt_test(tst_qquicktextmetrics
+qt_add_test(tst_qquicktextmetrics
SOURCES
tst_qquicktextmetrics.cpp
LIBRARIES
diff --git a/tests/auto/quick/qquicktimeline/CMakeLists.txt b/tests/auto/quick/qquicktimeline/CMakeLists.txt
index 40e926dd0d..3b282ce0af 100644
--- a/tests/auto/quick/qquicktimeline/CMakeLists.txt
+++ b/tests/auto/quick/qquicktimeline/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qquicktimeline Test:
#####################################################################
-add_qt_test(tst_qquicktimeline
+qt_add_test(tst_qquicktimeline
SOURCES
tst_qquicktimeline.cpp
LIBRARIES
diff --git a/tests/auto/quick/qquickview/CMakeLists.txt b/tests/auto/quick/qquickview/CMakeLists.txt
index c7cf57a66a..9216d18ec7 100644
--- a/tests/auto/quick/qquickview/CMakeLists.txt
+++ b/tests/auto/quick/qquickview/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickview
+qt_add_test(tst_qquickview
SOURCES
../../shared/util.cpp ../../shared/util.h
../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -36,12 +36,12 @@ add_qt_test(tst_qquickview
## Scopes:
#####################################################################
-extend_target(tst_qquickview CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickview CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickview CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickview CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt b/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt
index f9d4d96473..20aa59cb9f 100644
--- a/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt
+++ b/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickvisualdatamodel
+qt_add_test(tst_qquickvisualdatamodel
SOURCES
../../shared/util.cpp ../../shared/util.h
../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -38,17 +38,17 @@ add_qt_test(tst_qquickvisualdatamodel
## Scopes:
#####################################################################
-extend_target(tst_qquickvisualdatamodel CONDITION TARGET Qt::Widgets
+qt_extend_target(tst_qquickvisualdatamodel CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)
-extend_target(tst_qquickvisualdatamodel CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickvisualdatamodel CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickvisualdatamodel CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickvisualdatamodel CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/qquickwindow/CMakeLists.txt b/tests/auto/quick/qquickwindow/CMakeLists.txt
index 8d119952f7..338b6edbbc 100644
--- a/tests/auto/quick/qquickwindow/CMakeLists.txt
+++ b/tests/auto/quick/qquickwindow/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickwindow
+qt_add_test(tst_qquickwindow
SOURCES
../../shared/util.cpp ../../shared/util.h
../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -39,12 +39,12 @@ add_qt_test(tst_qquickwindow
## Scopes:
#####################################################################
-extend_target(tst_qquickwindow CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickwindow CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickwindow CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickwindow CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/rendernode/CMakeLists.txt b/tests/auto/quick/rendernode/CMakeLists.txt
index 7116c65a6c..2686873672 100644
--- a/tests/auto/quick/rendernode/CMakeLists.txt
+++ b/tests/auto/quick/rendernode/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_rendernode
+qt_add_test(tst_rendernode
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_rendernode.cpp
@@ -34,12 +34,12 @@ add_qt_test(tst_rendernode
## Scopes:
#####################################################################
-extend_target(tst_rendernode CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_rendernode CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_rendernode CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_rendernode CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/scenegraph/CMakeLists.txt b/tests/auto/quick/scenegraph/CMakeLists.txt
index e36a2b6720..888311d698 100644
--- a/tests/auto/quick/scenegraph/CMakeLists.txt
+++ b/tests/auto/quick/scenegraph/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_scenegraph Test:
#####################################################################
-add_qt_test(tst_scenegraph
+qt_add_test(tst_scenegraph
SOURCES
../../shared/util.cpp ../../shared/util.h
../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -32,12 +32,12 @@ add_qt_test(tst_scenegraph
## Scopes:
#####################################################################
-extend_target(tst_scenegraph CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_scenegraph CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_scenegraph CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_scenegraph CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quick/sharedimage/CMakeLists.txt b/tests/auto/quick/sharedimage/CMakeLists.txt
index 41ab25187d..f8c4c707bd 100644
--- a/tests/auto/quick/sharedimage/CMakeLists.txt
+++ b/tests/auto/quick/sharedimage/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_sharedimage
+qt_add_test(tst_sharedimage
SOURCES
tst_sharedimage.cpp
LIBRARIES
diff --git a/tests/auto/quick/touchmouse/CMakeLists.txt b/tests/auto/quick/touchmouse/CMakeLists.txt
index 5b1c02b0e5..f8c1e2f186 100644
--- a/tests/auto/quick/touchmouse/CMakeLists.txt
+++ b/tests/auto/quick/touchmouse/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_touchmouse
+qt_add_test(tst_touchmouse
SOURCES
../../shared/util.cpp ../../shared/util.h
../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
@@ -36,12 +36,12 @@ add_qt_test(tst_touchmouse
## Scopes:
#####################################################################
-extend_target(tst_touchmouse CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_touchmouse CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_touchmouse CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_touchmouse CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quicktest/polish-qml/CMakeLists.txt b/tests/auto/quicktest/polish-qml/CMakeLists.txt
index d6e97809bd..e870edd415 100644
--- a/tests/auto/quicktest/polish-qml/CMakeLists.txt
+++ b/tests/auto/quicktest/polish-qml/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_polish-qml
+qt_add_test(tst_polish-qml
QMLTEST
SOURCES
../../shared/util.cpp ../../shared/util.h
@@ -28,12 +28,12 @@ add_qt_test(tst_polish-qml
## Scopes:
#####################################################################
-extend_target(tst_polish-qml CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_polish-qml CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_polish-qml CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_polish-qml CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quicktest/polish/CMakeLists.txt b/tests/auto/quicktest/polish/CMakeLists.txt
index d55bd789b9..ea2bb8818e 100644
--- a/tests/auto/quicktest/polish/CMakeLists.txt
+++ b/tests/auto/quicktest/polish/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_polish
+qt_add_test(tst_polish
QMLTEST
SOURCES
../../shared/util.cpp ../../shared/util.h
@@ -28,12 +28,12 @@ add_qt_test(tst_polish
## Scopes:
#####################################################################
-extend_target(tst_polish CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_polish CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_polish CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_polish CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quicktest/quicktestmainwithsetup/CMakeLists.txt b/tests/auto/quicktest/quicktestmainwithsetup/CMakeLists.txt
index ebd9130394..4b10858548 100644
--- a/tests/auto/quicktest/quicktestmainwithsetup/CMakeLists.txt
+++ b/tests/auto/quicktest/quicktestmainwithsetup/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
${CMAKE_CURRENT_SOURCE_DIR}/data/*.qml)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_quicktestmainwithsetup
+qt_add_test(tst_quicktestmainwithsetup
QMLTEST
SOURCES
../../shared/util.cpp ../../shared/util.h
@@ -26,12 +26,12 @@ add_qt_test(tst_quicktestmainwithsetup
## Scopes:
#####################################################################
-extend_target(tst_quicktestmainwithsetup CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_quicktestmainwithsetup CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_quicktestmainwithsetup CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_quicktestmainwithsetup CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quicktest/signalspy/CMakeLists.txt b/tests/auto/quicktest/signalspy/CMakeLists.txt
index ae4e3e7b48..eef90449ff 100644
--- a/tests/auto/quicktest/signalspy/CMakeLists.txt
+++ b/tests/auto/quicktest/signalspy/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_signalspy Test:
#####################################################################
-add_qt_test(tst_signalspy
+qt_add_test(tst_signalspy
SOURCES
../../shared/util.cpp ../../shared/util.h
mypropertymap.cpp mypropertymap.h
@@ -19,12 +19,12 @@ add_qt_test(tst_signalspy
## Scopes:
#####################################################################
-extend_target(tst_signalspy CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_signalspy CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_signalspy CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_signalspy CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/quicktest/testfiltering/quicktestmain/CMakeLists.txt b/tests/auto/quicktest/testfiltering/quicktestmain/CMakeLists.txt
index b27c8b6dc4..9baedbab97 100644
--- a/tests/auto/quicktest/testfiltering/quicktestmain/CMakeLists.txt
+++ b/tests/auto/quicktest/testfiltering/quicktestmain/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
${CMAKE_CURRENT_SOURCE_DIR}/*.qml)
list(APPEND test_data ${test_data_glob})
-add_qt_test(quicktestmain
+qt_add_test(quicktestmain
GUI
QMLTEST
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
diff --git a/tests/auto/quicktest/testfiltering/test/CMakeLists.txt b/tests/auto/quicktest/testfiltering/test/CMakeLists.txt
index 194e8fe4b7..cfdb53ca89 100644
--- a/tests/auto/quicktest/testfiltering/test/CMakeLists.txt
+++ b/tests/auto/quicktest/testfiltering/test/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_testfiltering Test:
#####################################################################
-add_qt_test(tst_testfiltering
+qt_add_test(tst_testfiltering
SOURCES
../tst_testfiltering.cpp
PUBLIC_LIBRARIES
diff --git a/tests/auto/quickwidgets/qquickwidget/CMakeLists.txt b/tests/auto/quickwidgets/qquickwidget/CMakeLists.txt
index c8ec734b4a..52b9f4855e 100644
--- a/tests/auto/quickwidgets/qquickwidget/CMakeLists.txt
+++ b/tests/auto/quickwidgets/qquickwidget/CMakeLists.txt
@@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob
data/*)
list(APPEND test_data ${test_data_glob})
-add_qt_test(tst_qquickwidget
+qt_add_test(tst_qquickwidget
SOURCES
../../shared/util.cpp ../../shared/util.h
tst_qquickwidget.cpp
@@ -38,12 +38,12 @@ add_qt_test(tst_qquickwidget
## Scopes:
#####################################################################
-extend_target(tst_qquickwidget CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickwidget CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qquickwidget CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickwidget CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/auto/toolsupport/CMakeLists.txt b/tests/auto/toolsupport/CMakeLists.txt
index 929201afdb..2c95835f32 100644
--- a/tests/auto/toolsupport/CMakeLists.txt
+++ b/tests/auto/toolsupport/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_toolsupport Test:
#####################################################################
-add_qt_test(tst_toolsupport
+qt_add_test(tst_toolsupport
SOURCES
tst_toolsupport.cpp
LIBRARIES
diff --git a/tests/benchmarks/particles/affectors/CMakeLists.txt b/tests/benchmarks/particles/affectors/CMakeLists.txt
index 0a6b52e563..35c9e46329 100644
--- a/tests/benchmarks/particles/affectors/CMakeLists.txt
+++ b/tests/benchmarks/particles/affectors/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_affectors Binary:
#####################################################################
-add_qt_benchmark(tst_affectors
+qt_add_benchmark(tst_affectors
SOURCES
tst_affectors.cpp
DEFINES
diff --git a/tests/benchmarks/particles/emission/CMakeLists.txt b/tests/benchmarks/particles/emission/CMakeLists.txt
index de9598b76f..4347283c06 100644
--- a/tests/benchmarks/particles/emission/CMakeLists.txt
+++ b/tests/benchmarks/particles/emission/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_emission Binary:
#####################################################################
-add_qt_benchmark(tst_emission
+qt_add_benchmark(tst_emission
SOURCES
tst_emission.cpp
LIBRARIES
diff --git a/tests/benchmarks/qml/animation/CMakeLists.txt b/tests/benchmarks/qml/animation/CMakeLists.txt
index e1697ad18b..bb2e1fe090 100644
--- a/tests/benchmarks/qml/animation/CMakeLists.txt
+++ b/tests/benchmarks/qml/animation/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_animation Binary:
#####################################################################
-add_qt_benchmark(tst_animation
+qt_add_benchmark(tst_animation
SOURCES
tst_animation.cpp
DEFINES
diff --git a/tests/benchmarks/qml/binding/CMakeLists.txt b/tests/benchmarks/qml/binding/CMakeLists.txt
index 8069310430..60ebf582de 100644
--- a/tests/benchmarks/qml/binding/CMakeLists.txt
+++ b/tests/benchmarks/qml/binding/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_binding Binary:
#####################################################################
-add_qt_benchmark(tst_binding
+qt_add_benchmark(tst_binding
SOURCES
testtypes.cpp testtypes.h
tst_binding.cpp
diff --git a/tests/benchmarks/qml/compilation/CMakeLists.txt b/tests/benchmarks/qml/compilation/CMakeLists.txt
index ba6d59fdf5..addb108857 100644
--- a/tests/benchmarks/qml/compilation/CMakeLists.txt
+++ b/tests/benchmarks/qml/compilation/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_compilation Binary:
#####################################################################
-add_qt_benchmark(tst_compilation
+qt_add_benchmark(tst_compilation
SOURCES
tst_compilation.cpp
DEFINES
diff --git a/tests/benchmarks/qml/creation/CMakeLists.txt b/tests/benchmarks/qml/creation/CMakeLists.txt
index 3b3cd56d8e..e7cdd60bd5 100644
--- a/tests/benchmarks/qml/creation/CMakeLists.txt
+++ b/tests/benchmarks/qml/creation/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_creation Binary:
#####################################################################
-add_qt_benchmark(tst_creation
+qt_add_benchmark(tst_creation
SOURCES
tst_creation.cpp
DEFINES
diff --git a/tests/benchmarks/qml/holistic/CMakeLists.txt b/tests/benchmarks/qml/holistic/CMakeLists.txt
index 16942d0350..746254cbea 100644
--- a/tests/benchmarks/qml/holistic/CMakeLists.txt
+++ b/tests/benchmarks/qml/holistic/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_holistic Binary:
#####################################################################
-add_qt_benchmark(tst_holistic
+qt_add_benchmark(tst_holistic
SOURCES
testtypes.cpp testtypes.h
tst_holistic.cpp
diff --git a/tests/benchmarks/qml/javascript/CMakeLists.txt b/tests/benchmarks/qml/javascript/CMakeLists.txt
index 9a73b0f047..837d46df05 100644
--- a/tests/benchmarks/qml/javascript/CMakeLists.txt
+++ b/tests/benchmarks/qml/javascript/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_javascript Binary:
#####################################################################
-add_qt_benchmark(tst_javascript
+qt_add_benchmark(tst_javascript
SOURCES
testtypes.cpp testtypes.h
tst_javascript.cpp
diff --git a/tests/benchmarks/qml/js/qjsengine/CMakeLists.txt b/tests/benchmarks/qml/js/qjsengine/CMakeLists.txt
index f44669cdc6..577514e2ce 100644
--- a/tests/benchmarks/qml/js/qjsengine/CMakeLists.txt
+++ b/tests/benchmarks/qml/js/qjsengine/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_bench_qjsengine Binary:
#####################################################################
-add_qt_benchmark(tst_bench_qjsengine
+qt_add_benchmark(tst_bench_qjsengine
SOURCES
tst_qjsengine.cpp
PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/qml/js/qjsvalue/CMakeLists.txt b/tests/benchmarks/qml/js/qjsvalue/CMakeLists.txt
index c9dc3ad76d..8c56fa1820 100644
--- a/tests/benchmarks/qml/js/qjsvalue/CMakeLists.txt
+++ b/tests/benchmarks/qml/js/qjsvalue/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_bench_qjsvalue Binary:
#####################################################################
-add_qt_benchmark(tst_bench_qjsvalue
+qt_add_benchmark(tst_bench_qjsvalue
SOURCES
tst_qjsvalue.cpp
PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/qml/js/qjsvalueiterator/CMakeLists.txt b/tests/benchmarks/qml/js/qjsvalueiterator/CMakeLists.txt
index dd5f818591..99e19d45a4 100644
--- a/tests/benchmarks/qml/js/qjsvalueiterator/CMakeLists.txt
+++ b/tests/benchmarks/qml/js/qjsvalueiterator/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_bench_qjsvalueiterator Binary:
#####################################################################
-add_qt_benchmark(tst_bench_qjsvalueiterator
+qt_add_benchmark(tst_bench_qjsvalueiterator
SOURCES
tst_qjsvalueiterator.cpp
PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/qml/librarymetrics_performance/CMakeLists.txt b/tests/benchmarks/qml/librarymetrics_performance/CMakeLists.txt
index 4c9df052a8..e70db585a8 100644
--- a/tests/benchmarks/qml/librarymetrics_performance/CMakeLists.txt
+++ b/tests/benchmarks/qml/librarymetrics_performance/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_librarymetrics_performance Binary:
#####################################################################
-add_qt_benchmark(tst_librarymetrics_performance
+qt_add_benchmark(tst_librarymetrics_performance
SOURCES
tst_librarymetrics_performance.cpp
PUBLIC_LIBRARIES
@@ -20,7 +20,7 @@ set(qmake_immediate_resource_files
"data"
)
-add_qt_resource(tst_librarymetrics_performance "qmake_immediate"
+qt_add_resource(tst_librarymetrics_performance "qmake_immediate"
PREFIX
"/"
FILES
diff --git a/tests/benchmarks/qml/painting/CMakeLists.txt b/tests/benchmarks/qml/painting/CMakeLists.txt
index 35af3afdf9..a194328db1 100644
--- a/tests/benchmarks/qml/painting/CMakeLists.txt
+++ b/tests/benchmarks/qml/painting/CMakeLists.txt
@@ -4,7 +4,7 @@
## painting Binary:
#####################################################################
-add_qt_benchmark(painting
+qt_add_benchmark(painting
SOURCES
paintbenchmark.cpp
PUBLIC_LIBRARIES
diff --git a/tests/benchmarks/qml/qqmlchangeset/CMakeLists.txt b/tests/benchmarks/qml/qqmlchangeset/CMakeLists.txt
index 60c0f42b78..f5c02ef04e 100644
--- a/tests/benchmarks/qml/qqmlchangeset/CMakeLists.txt
+++ b/tests/benchmarks/qml/qqmlchangeset/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qqmlchangeset Binary:
#####################################################################
-add_qt_benchmark(tst_qqmlchangeset
+qt_add_benchmark(tst_qqmlchangeset
SOURCES
tst_qqmlchangeset.cpp
DEFINES
diff --git a/tests/benchmarks/qml/qqmlcomponent/.prev_CMakeLists.txt b/tests/benchmarks/qml/qqmlcomponent/.prev_CMakeLists.txt
index cda254fc4d..d219c447d7 100644
--- a/tests/benchmarks/qml/qqmlcomponent/.prev_CMakeLists.txt
+++ b/tests/benchmarks/qml/qqmlcomponent/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qqmlcomponent Binary:
#####################################################################
-add_qt_benchmark(tst_qqmlcomponent
+qt_add_benchmark(tst_qqmlcomponent
SOURCES
testtypes.cpp testtypes.h
tst_qqmlcomponent.cpp
diff --git a/tests/benchmarks/qml/qqmlcomponent/CMakeLists.txt b/tests/benchmarks/qml/qqmlcomponent/CMakeLists.txt
index 3d980daed5..faa9dac56f 100644
--- a/tests/benchmarks/qml/qqmlcomponent/CMakeLists.txt
+++ b/tests/benchmarks/qml/qqmlcomponent/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qqmlcomponent Binary:
#####################################################################
-add_qt_benchmark(tst_qqmlcomponent_benchmark # special case avoid collision with auto test
+qt_add_benchmark(tst_qqmlcomponent_benchmark # special case avoid collision with auto test
GUI
SOURCES
testtypes.cpp testtypes.h
diff --git a/tests/benchmarks/qml/qqmlmetaproperty/CMakeLists.txt b/tests/benchmarks/qml/qqmlmetaproperty/CMakeLists.txt
index 872d676b70..e0a7db012a 100644
--- a/tests/benchmarks/qml/qqmlmetaproperty/CMakeLists.txt
+++ b/tests/benchmarks/qml/qqmlmetaproperty/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qqmlmetaproperty Binary:
#####################################################################
-add_qt_benchmark(tst_qqmlmetaproperty
+qt_add_benchmark(tst_qqmlmetaproperty
SOURCES
tst_qqmlmetaproperty.cpp
DEFINES
diff --git a/tests/benchmarks/qml/qquickwindow/CMakeLists.txt b/tests/benchmarks/qml/qquickwindow/CMakeLists.txt
index b9c4569d1b..684f3f194b 100644
--- a/tests/benchmarks/qml/qquickwindow/CMakeLists.txt
+++ b/tests/benchmarks/qml/qquickwindow/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qquickwindow Binary:
#####################################################################
-add_qt_benchmark(tst_qquickwindow
+qt_add_benchmark(tst_qquickwindow
SOURCES
tst_qquickwindow.cpp
DEFINES
diff --git a/tests/benchmarks/qml/script/CMakeLists.txt b/tests/benchmarks/qml/script/CMakeLists.txt
index 8e1941304a..2a18405b43 100644
--- a/tests/benchmarks/qml/script/CMakeLists.txt
+++ b/tests/benchmarks/qml/script/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_script Binary:
#####################################################################
-add_qt_benchmark(tst_script
+qt_add_benchmark(tst_script
SOURCES
tst_script.cpp
DEFINES
diff --git a/tests/benchmarks/qml/typeimports/CMakeLists.txt b/tests/benchmarks/qml/typeimports/CMakeLists.txt
index dd28a9bc0c..93f1f7c73b 100644
--- a/tests/benchmarks/qml/typeimports/CMakeLists.txt
+++ b/tests/benchmarks/qml/typeimports/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_typeimports Binary:
#####################################################################
-add_qt_benchmark(tst_typeimports
+qt_add_benchmark(tst_typeimports
SOURCES
tst_typeimports.cpp
DEFINES
diff --git a/tests/benchmarks/quick/events/CMakeLists.txt b/tests/benchmarks/quick/events/CMakeLists.txt
index 5cd731f9be..374e3a6094 100644
--- a/tests/benchmarks/quick/events/CMakeLists.txt
+++ b/tests/benchmarks/quick/events/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_qevents Binary:
#####################################################################
-add_qt_benchmark(tst_qevents
+qt_add_benchmark(tst_qevents
SOURCES
../../../auto/quick/shared/geometrytestutil.cpp ../../../auto/quick/shared/geometrytestutil.h
../../../auto/quick/shared/viewtestutil.cpp ../../../auto/quick/shared/viewtestutil.h
@@ -33,12 +33,12 @@ add_qt_benchmark(tst_qevents
## Scopes:
#####################################################################
-extend_target(tst_qevents CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qevents CONDITION ANDROID OR APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\":/data\\\"
)
-extend_target(tst_qevents CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qevents CONDITION NOT ANDROID AND NOT APPLE_IOS
DEFINES
QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
)
diff --git a/tests/libfuzzer/qml/jsapi/evaluate/CMakeLists.txt b/tests/libfuzzer/qml/jsapi/evaluate/CMakeLists.txt
index 10891b5d2d..0d5a5b2b14 100644
--- a/tests/libfuzzer/qml/jsapi/evaluate/CMakeLists.txt
+++ b/tests/libfuzzer/qml/jsapi/evaluate/CMakeLists.txt
@@ -4,7 +4,7 @@
## evaluate Binary:
#####################################################################
-add_qt_executable(evaluate
+qt_add_executable(evaluate
SOURCES
main.cpp
PUBLIC_LIBRARIES
diff --git a/tests/manual/highdpi/CMakeLists.txt b/tests/manual/highdpi/CMakeLists.txt
index 13d2d9e189..4ae749c660 100644
--- a/tests/manual/highdpi/CMakeLists.txt
+++ b/tests/manual/highdpi/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmlimageproviderplugin Generic Library:
#####################################################################
-add_cmake_library(qmlimageproviderplugin
+qt_add_cmake_library(qmlimageproviderplugin
MODULE
INSTALL_DIRECTORY "${INSTALL_EXAMPLESDIR}/quick/imageprovider/ImageProvider"
OUTPUT_DIRECTORY "ImageProvider"
diff --git a/tests/manual/httpserver/CMakeLists.txt b/tests/manual/httpserver/CMakeLists.txt
index 7bd972d492..105799e59e 100644
--- a/tests/manual/httpserver/CMakeLists.txt
+++ b/tests/manual/httpserver/CMakeLists.txt
@@ -4,7 +4,7 @@
## httpserver Binary:
#####################################################################
-add_qt_manual_test(httpserver
+qt_add_manual_test(httpserver
SOURCES
../../auto/shared/testhttpserver.cpp ../../auto/shared/testhttpserver.h
main.cpp
diff --git a/tests/manual/mousearea/CMakeLists.txt b/tests/manual/mousearea/CMakeLists.txt
index ca676bc542..f3b0003ea3 100644
--- a/tests/manual/mousearea/CMakeLists.txt
+++ b/tests/manual/mousearea/CMakeLists.txt
@@ -4,7 +4,7 @@
## mousearea Binary:
#####################################################################
-add_qt_manual_test(mousearea
+qt_add_manual_test(mousearea
GUI
SOURCES
main.cpp
@@ -20,7 +20,7 @@ set(qml_resource_files
"plainMouseArea.qml"
)
-add_qt_resource(mousearea "qml"
+qt_add_resource(mousearea "qml"
PREFIX
"/"
FILES
@@ -73,7 +73,7 @@ set(quick_shared_resource_files
"images/slider_handle.png"
)
-add_qt_resource(mousearea "quick_shared"
+qt_add_resource(mousearea "quick_shared"
PREFIX
"/quick/shared"
BASE
diff --git a/tests/manual/nodetypes/CMakeLists.txt b/tests/manual/nodetypes/CMakeLists.txt
index 1873120aac..cdb64701b8 100644
--- a/tests/manual/nodetypes/CMakeLists.txt
+++ b/tests/manual/nodetypes/CMakeLists.txt
@@ -4,7 +4,7 @@
## nodetypes Binary:
#####################################################################
-add_qt_manual_test(nodetypes
+qt_add_manual_test(nodetypes
GUI
SOURCES
nodetypes.cpp
@@ -35,7 +35,7 @@ set(nodetypes_resource_files
"vs_wobble.cso"
)
-add_qt_resource(nodetypes "nodetypes"
+qt_add_resource(nodetypes "nodetypes"
PREFIX
"/"
FILES
diff --git a/tests/manual/nodetypes_ng/CMakeLists.txt b/tests/manual/nodetypes_ng/CMakeLists.txt
index 81908c69db..5687cb2768 100644
--- a/tests/manual/nodetypes_ng/CMakeLists.txt
+++ b/tests/manual/nodetypes_ng/CMakeLists.txt
@@ -4,7 +4,7 @@
## nodetypes_ng Binary:
#####################################################################
-add_qt_manual_test(nodetypes_ng
+qt_add_manual_test(nodetypes_ng
GUI
SOURCES
nodetypes_ng.cpp
@@ -52,7 +52,7 @@ set(nodetypes_ng_resource_files
"wobble_legacy_gl.vert"
)
-add_qt_resource(nodetypes_ng "nodetypes_ng"
+qt_add_resource(nodetypes_ng "nodetypes_ng"
PREFIX
"/"
FILES
diff --git a/tests/manual/pointer/CMakeLists.txt b/tests/manual/pointer/CMakeLists.txt
index 1c70e03f62..49550f3c7e 100644
--- a/tests/manual/pointer/CMakeLists.txt
+++ b/tests/manual/pointer/CMakeLists.txt
@@ -4,7 +4,7 @@
## pointer Binary:
#####################################################################
-add_qt_manual_test(pointer
+qt_add_manual_test(pointer
GUI
SOURCES
inputinspector.cpp inputinspector.h
@@ -65,7 +65,7 @@ set(qml_resource_files
"tapHandler.qml"
)
-add_qt_resource(pointer "qml"
+qt_add_resource(pointer "qml"
PREFIX
"/"
FILES
@@ -118,7 +118,7 @@ set(quick_shared_resource_files
"images/slider_handle.png"
)
-add_qt_resource(pointer "quick_shared"
+qt_add_resource(pointer "quick_shared"
PREFIX
"/quick/shared"
BASE
diff --git a/tests/manual/qmltypememory/CMakeLists.txt b/tests/manual/qmltypememory/CMakeLists.txt
index faf21c7b13..ae3a10e944 100644
--- a/tests/manual/qmltypememory/CMakeLists.txt
+++ b/tests/manual/qmltypememory/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmltypememory Binary:
#####################################################################
-add_qt_manual_test(qmltypememory
+qt_add_manual_test(qmltypememory
GUI
SOURCES
main.cpp
diff --git a/tests/manual/qmltypememory/TestPlugin/CMakeLists.txt b/tests/manual/qmltypememory/TestPlugin/CMakeLists.txt
index 3c24c3eed8..d05139d0ea 100644
--- a/tests/manual/qmltypememory/TestPlugin/CMakeLists.txt
+++ b/tests/manual/qmltypememory/TestPlugin/CMakeLists.txt
@@ -4,7 +4,7 @@
## testplugin Generic Library:
#####################################################################
-add_cmake_library(testplugin
+qt_add_cmake_library(testplugin
MODULE
SOURCES
plugin.cpp
diff --git a/tests/manual/quickwidgetviewer/CMakeLists.txt b/tests/manual/quickwidgetviewer/CMakeLists.txt
index 7e53a4cd49..00245e4942 100644
--- a/tests/manual/quickwidgetviewer/CMakeLists.txt
+++ b/tests/manual/quickwidgetviewer/CMakeLists.txt
@@ -4,7 +4,7 @@
## quickwidgetviewer Binary:
#####################################################################
-add_qt_manual_test(quickwidgetviewer
+qt_add_manual_test(quickwidgetviewer
SOURCES
main.cpp
PUBLIC_LIBRARIES
diff --git a/tests/manual/scalablepath/CMakeLists.txt b/tests/manual/scalablepath/CMakeLists.txt
index bf82a450ec..738c6ebb45 100644
--- a/tests/manual/scalablepath/CMakeLists.txt
+++ b/tests/manual/scalablepath/CMakeLists.txt
@@ -4,7 +4,7 @@
## scalablepath Binary:
#####################################################################
-add_qt_manual_test(scalablepath
+qt_add_manual_test(scalablepath
GUI
SOURCES
main.cpp
@@ -20,7 +20,7 @@ set(qml_resource_files
"main.qml"
)
-add_qt_resource(scalablepath "qml"
+qt_add_resource(scalablepath "qml"
PREFIX
"/"
FILES
diff --git a/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt b/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt
index 9cf03d738a..a36b28d91d 100644
--- a/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt
+++ b/tests/manual/scenegraph_lancelot/scenegrabber/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmlscenegrabber Binary:
#####################################################################
-add_qt_manual_test(qmlscenegrabber
+qt_add_manual_test(qmlscenegrabber
OUTPUT_DIRECTORY ".."
SOURCES
main.cpp
diff --git a/tests/manual/scenegraph_lancelot/scenegraph/CMakeLists.txt b/tests/manual/scenegraph_lancelot/scenegraph/CMakeLists.txt
index 3e5dca6d0a..8bc4a4649c 100644
--- a/tests/manual/scenegraph_lancelot/scenegraph/CMakeLists.txt
+++ b/tests/manual/scenegraph_lancelot/scenegraph/CMakeLists.txt
@@ -7,7 +7,7 @@
# Collect test data
list(APPEND test_data "../data")
-add_qt_test(tst_scenegraph
+qt_add_test(tst_scenegraph
OUTPUT_DIRECTORY ".."
SOURCES
../../../../../qtbase/tests/baselineserver/shared/baselineprotocol.cpp ../../../../../qtbase/tests/baselineserver/shared/baselineprotocol.h
diff --git a/tests/manual/shapestest/CMakeLists.txt b/tests/manual/shapestest/CMakeLists.txt
index e93e16a8ef..6fd93cdc11 100644
--- a/tests/manual/shapestest/CMakeLists.txt
+++ b/tests/manual/shapestest/CMakeLists.txt
@@ -4,7 +4,7 @@
## shapestest Binary:
#####################################################################
-add_qt_manual_test(shapestest
+qt_add_manual_test(shapestest
GUI
SOURCES
main.cpp
@@ -19,7 +19,7 @@ set(shapestest_resource_files
"shapestest.qml"
)
-add_qt_resource(shapestest "shapestest"
+qt_add_resource(shapestest "shapestest"
PREFIX
"/shapestest"
FILES
diff --git a/tests/manual/tableview/abstracttablemodel/CMakeLists.txt b/tests/manual/tableview/abstracttablemodel/CMakeLists.txt
index a7137c0ae8..2aa3d5b797 100644
--- a/tests/manual/tableview/abstracttablemodel/CMakeLists.txt
+++ b/tests/manual/tableview/abstracttablemodel/CMakeLists.txt
@@ -4,7 +4,7 @@
## tableview_abstracttablemodel Binary:
#####################################################################
-add_qt_manual_test(tableview_abstracttablemodel
+qt_add_manual_test(tableview_abstracttablemodel
GUI
SOURCES
main.cpp
@@ -20,7 +20,7 @@ set(qmake_immediate_resource_files
"main.qml"
)
-add_qt_resource(tableview_abstracttablemodel "qmake_immediate"
+qt_add_resource(tableview_abstracttablemodel "qmake_immediate"
PREFIX
"/"
FILES
diff --git a/tests/manual/tableview/listmodel/CMakeLists.txt b/tests/manual/tableview/listmodel/CMakeLists.txt
index bd9297a259..9e4b8871cc 100644
--- a/tests/manual/tableview/listmodel/CMakeLists.txt
+++ b/tests/manual/tableview/listmodel/CMakeLists.txt
@@ -4,7 +4,7 @@
## tableview_listmodel Binary:
#####################################################################
-add_qt_manual_test(tableview_listmodel
+qt_add_manual_test(tableview_listmodel
GUI
SOURCES
main.cpp
@@ -19,7 +19,7 @@ set(qmake_immediate_resource_files
"main.qml"
)
-add_qt_resource(tableview_listmodel "qmake_immediate"
+qt_add_resource(tableview_listmodel "qmake_immediate"
PREFIX
"/"
FILES
diff --git a/tests/manual/tableview/storagemodel/CMakeLists.txt b/tests/manual/tableview/storagemodel/CMakeLists.txt
index f920fb28d4..747d5f5b40 100644
--- a/tests/manual/tableview/storagemodel/CMakeLists.txt
+++ b/tests/manual/tableview/storagemodel/CMakeLists.txt
@@ -4,7 +4,7 @@
## tableview_storage Binary:
#####################################################################
-add_qt_manual_test(tableview_storage
+qt_add_manual_test(tableview_storage
GUI
SOURCES
main.cpp
@@ -20,7 +20,7 @@ set(qmake_immediate_resource_files
"main.qml"
)
-add_qt_resource(tableview_storage "qmake_immediate"
+qt_add_resource(tableview_storage "qmake_immediate"
PREFIX
"/"
FILES
diff --git a/tests/manual/tableview/tablemodel/form/CMakeLists.txt b/tests/manual/tableview/tablemodel/form/CMakeLists.txt
index 2e2af0bbb1..4a4a7e28fe 100644
--- a/tests/manual/tableview/tablemodel/form/CMakeLists.txt
+++ b/tests/manual/tableview/tablemodel/form/CMakeLists.txt
@@ -4,7 +4,7 @@
## form Binary:
#####################################################################
-add_qt_manual_test(form
+qt_add_manual_test(form
GUI
SOURCES
main.cpp
@@ -20,7 +20,7 @@ set(qmake_immediate_resource_files
"main.qml"
)
-add_qt_resource(form "qmake_immediate"
+qt_add_resource(form "qmake_immediate"
PREFIX
"/"
FILES
diff --git a/tests/manual/tableview/tablemodel/json/CMakeLists.txt b/tests/manual/tableview/tablemodel/json/CMakeLists.txt
index c0b68b2eb6..4251d08269 100644
--- a/tests/manual/tableview/tablemodel/json/CMakeLists.txt
+++ b/tests/manual/tableview/tablemodel/json/CMakeLists.txt
@@ -4,7 +4,7 @@
## json Binary:
#####################################################################
-add_qt_manual_test(json
+qt_add_manual_test(json
GUI
SOURCES
main.cpp
@@ -20,7 +20,7 @@ set(qmake_immediate_resource_files
"main.qml"
)
-add_qt_resource(json "qmake_immediate"
+qt_add_resource(json "qmake_immediate"
PREFIX
"/"
FILES
diff --git a/tests/manual/text/CMakeLists.txt b/tests/manual/text/CMakeLists.txt
index 69524f4154..09c6d780e7 100644
--- a/tests/manual/text/CMakeLists.txt
+++ b/tests/manual/text/CMakeLists.txt
@@ -4,7 +4,7 @@
## text Binary:
#####################################################################
-add_qt_manual_test(text
+qt_add_manual_test(text
GUI
SOURCES
main.cpp
@@ -21,7 +21,7 @@ set(qml_resource_files
"textInputPropertiesAndSignals.qml"
)
-add_qt_resource(text "qml"
+qt_add_resource(text "qml"
PREFIX
"/"
FILES
@@ -74,7 +74,7 @@ set(quick_shared_resource_files
"images/slider_handle.png"
)
-add_qt_resource(text "quick_shared"
+qt_add_resource(text "quick_shared"
PREFIX
"/quick/shared"
BASE
diff --git a/tests/manual/touch/CMakeLists.txt b/tests/manual/touch/CMakeLists.txt
index d3d7a1e749..261bab2d49 100644
--- a/tests/manual/touch/CMakeLists.txt
+++ b/tests/manual/touch/CMakeLists.txt
@@ -4,7 +4,7 @@
## touch Binary:
#####################################################################
-add_qt_manual_test(touch
+qt_add_manual_test(touch
GUI
SOURCES
main.cpp
@@ -21,7 +21,7 @@ set(qml_resource_files
"mpta-crosshairs.qml"
)
-add_qt_resource(touch "qml"
+qt_add_resource(touch "qml"
PREFIX
"/"
FILES
@@ -74,7 +74,7 @@ set(quick_shared_resource_files
"images/slider_handle.png"
)
-add_qt_resource(touch "quick_shared"
+qt_add_resource(touch "quick_shared"
PREFIX
"/quick/shared"
BASE
diff --git a/tests/manual/v4/auto/executableallocator/CMakeLists.txt b/tests/manual/v4/auto/executableallocator/CMakeLists.txt
index 7b571171d6..c8a8c8d7ea 100644
--- a/tests/manual/v4/auto/executableallocator/CMakeLists.txt
+++ b/tests/manual/v4/auto/executableallocator/CMakeLists.txt
@@ -4,7 +4,7 @@
## tst_executableallocator Binary:
#####################################################################
-add_qt_manual_test(tst_executableallocator
+qt_add_manual_test(tst_executableallocator
SOURCES
tst_executableallocator.cpp
LIBRARIES
diff --git a/tools/qml/.prev_CMakeLists.txt b/tools/qml/.prev_CMakeLists.txt
index fc1f44d336..9c65660ece 100644
--- a/tools/qml/.prev_CMakeLists.txt
+++ b/tools/qml/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## qml Tool:
#####################################################################
-add_qt_tool(qml
+qt_add_tool(qml
SOURCES
conf.h
main.cpp
@@ -24,7 +24,7 @@ set(qml_resource_files
"resources/qml-64.png"
)
-add_qt_resource(qml "qml"
+qt_add_resource(qml "qml"
PREFIX
"/qt-project.org/QmlRuntime"
FILES
@@ -39,12 +39,12 @@ add_qt_resource(qml "qml"
## Scopes:
#####################################################################
-extend_target(qml CONDITION TARGET Qt::Gui
+qt_extend_target(qml CONDITION TARGET Qt::Gui
PUBLIC_LIBRARIES
Qt::Gui
)
-extend_target(qml CONDITION TARGET Qt::Widgets
+qt_extend_target(qml CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)
@@ -57,7 +57,7 @@ extend_target(qml CONDITION TARGET Qt::Widgets
# OTHER_FILES = "resources/Info.plist"
# QMAKE_INFO_PLIST = "resources/Info.plist"
-extend_target(qml CONDITION QT_FEATURE_qml_debug
+qt_extend_target(qml CONDITION QT_FEATURE_qml_debug
DEFINES
QT_QML_DEBUG_NO_WARNING
)
diff --git a/tools/qml/CMakeLists.txt b/tools/qml/CMakeLists.txt
index 84d4c9b803..12cec77288 100644
--- a/tools/qml/CMakeLists.txt
+++ b/tools/qml/CMakeLists.txt
@@ -4,7 +4,7 @@
## qml Tool:
#####################################################################
-add_qt_tool(qml
+qt_add_tool(qml
TOOLS_TARGET Qml # special case
SOURCES
conf.h
@@ -35,7 +35,7 @@ set(qml_resource_files
"resources/qml-64.png"
)
-add_qt_resource(qml "qml"
+qt_add_resource(qml "qml"
PREFIX
"/qt-project.org/QmlRuntime"
FILES
@@ -50,12 +50,12 @@ add_qt_resource(qml "qml"
## Scopes:
#####################################################################
-extend_target(qml CONDITION TARGET Qt::Gui
+qt_extend_target(qml CONDITION TARGET Qt::Gui
PUBLIC_LIBRARIES
Qt::Gui
)
-extend_target(qml CONDITION TARGET Qt::Widgets
+qt_extend_target(qml CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)
@@ -68,7 +68,7 @@ extend_target(qml CONDITION TARGET Qt::Widgets
# OTHER_FILES = "resources/Info.plist"
# QMAKE_INFO_PLIST = "resources/Info.plist"
-extend_target(qml CONDITION QT_FEATURE_qml_debug
+qt_extend_target(qml CONDITION QT_FEATURE_qml_debug
DEFINES
QT_QML_DEBUG_NO_WARNING
)
diff --git a/tools/qmlcachegen/.prev_CMakeLists.txt b/tools/qmlcachegen/.prev_CMakeLists.txt
index d509bad865..51e66d54d2 100644
--- a/tools/qmlcachegen/.prev_CMakeLists.txt
+++ b/tools/qmlcachegen/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## qmlcachegen Tool:
#####################################################################
-add_qt_tool(qmlcachegen
+qt_add_tool(qmlcachegen
SOURCES
generateloader.cpp
qmlcachegen.cpp
diff --git a/tools/qmlcachegen/CMakeLists.txt b/tools/qmlcachegen/CMakeLists.txt
index 4d82c9ce3e..a7fa98ebd8 100644
--- a/tools/qmlcachegen/CMakeLists.txt
+++ b/tools/qmlcachegen/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmlcachegen Tool:
#####################################################################
-add_qt_tool(qmlcachegen
+qt_add_tool(qmlcachegen
TOOLS_TARGET Qml # special case
SOURCES
generateloader.cpp
diff --git a/tools/qmleasing/CMakeLists.txt b/tools/qmleasing/CMakeLists.txt
index 9893d8e657..a057e4c50c 100644
--- a/tools/qmleasing/CMakeLists.txt
+++ b/tools/qmleasing/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmleasing Binary:
#####################################################################
-add_qt_executable(qmleasing
+qt_add_executable(qmleasing
GUI
SOURCES
import.ui
@@ -29,7 +29,7 @@ set(resources_resource_files
"preview.qml"
)
-add_qt_resource(qmleasing "resources"
+qt_add_resource(qmleasing "resources"
PREFIX
"/"
FILES
diff --git a/tools/qmlimportscanner/.prev_CMakeLists.txt b/tools/qmlimportscanner/.prev_CMakeLists.txt
index cdaf3b8bbe..7f736f24df 100644
--- a/tools/qmlimportscanner/.prev_CMakeLists.txt
+++ b/tools/qmlimportscanner/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## qmlimportscanner Tool:
#####################################################################
-add_qt_tool(qmlimportscanner
+qt_add_tool(qmlimportscanner
SOURCES
main.cpp
DEFINES
diff --git a/tools/qmlimportscanner/CMakeLists.txt b/tools/qmlimportscanner/CMakeLists.txt
index 05f8837880..bffbb5f47b 100644
--- a/tools/qmlimportscanner/CMakeLists.txt
+++ b/tools/qmlimportscanner/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmlimportscanner Tool:
#####################################################################
-add_qt_tool(qmlimportscanner
+qt_add_tool(qmlimportscanner
TOOLS_TARGET Qml # special case
SOURCES
main.cpp
diff --git a/tools/qmljs/.prev_CMakeLists.txt b/tools/qmljs/.prev_CMakeLists.txt
index 2c3b500e03..0f845fa3ed 100644
--- a/tools/qmljs/.prev_CMakeLists.txt
+++ b/tools/qmljs/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## qmljs Tool:
#####################################################################
-add_qt_tool(qmljs
+qt_add_tool(qmljs
SOURCES
qmljs.cpp
DEFINES
@@ -45,42 +45,42 @@ add_qt_tool(qmljs
## Scopes:
#####################################################################
-extend_target(qmljs CONDITION WIN32
+qt_extend_target(qmljs CONDITION WIN32
DEFINES
NOMINMAX
)
-extend_target(qmljs CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
+qt_extend_target(qmljs CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
DEFINES
WTF_USE_UDIS86=1
)
-extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
+qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
DEFINES
WTF_USE_ARMV7_DISASSEMBLER=1
)
-extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
+qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
DEFINES
WTF_USE_ARM64_DISASSEMBLER=1
)
-extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
+qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
DEFINES
WTF_USE_MIPS32_DISASSEMBLER=1
)
-extend_target(qmljs CONDITION NOT disassembler
+qt_extend_target(qmljs CONDITION NOT disassembler
DEFINES
WTF_USE_UDIS86=0
)
-extend_target(qmljs CONDITION CMAKE_BUILD_TYPE STREQUAL Release
+qt_extend_target(qmljs CONDITION CMAKE_BUILD_TYPE STREQUAL Release
DEFINES
NDEBUG
)
-extend_target(qmljs CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
+qt_extend_target(qmljs CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
COMPILE_OPTIONS
-Wno-expansion-to-defined
)
diff --git a/tools/qmljs/CMakeLists.txt b/tools/qmljs/CMakeLists.txt
index 300a9ac47a..4655bfb9fc 100644
--- a/tools/qmljs/CMakeLists.txt
+++ b/tools/qmljs/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmljs Tool:
#####################################################################
-add_qt_tool(qmljs
+qt_add_tool(qmljs
TOOLS_TARGET Qml # special case
SOURCES
qmljs.cpp
@@ -46,42 +46,42 @@ add_qt_tool(qmljs
## Scopes:
#####################################################################
-extend_target(qmljs CONDITION WIN32
+qt_extend_target(qmljs CONDITION WIN32
DEFINES
NOMINMAX
)
-extend_target(qmljs CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
+qt_extend_target(qmljs CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
DEFINES
WTF_USE_UDIS86=1
)
-extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
+qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
DEFINES
WTF_USE_ARMV7_DISASSEMBLER=1
)
-extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
+qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
DEFINES
WTF_USE_ARM64_DISASSEMBLER=1
)
-extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
+qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
DEFINES
WTF_USE_MIPS32_DISASSEMBLER=1
)
-extend_target(qmljs CONDITION NOT disassembler
+qt_extend_target(qmljs CONDITION NOT disassembler
DEFINES
WTF_USE_UDIS86=0
)
-extend_target(qmljs CONDITION CMAKE_BUILD_TYPE STREQUAL Release
+qt_extend_target(qmljs CONDITION CMAKE_BUILD_TYPE STREQUAL Release
DEFINES
NDEBUG
)
-extend_target(qmljs CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
+qt_extend_target(qmljs CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
COMPILE_OPTIONS
-Wno-expansion-to-defined
)
diff --git a/tools/qmllint/.prev_CMakeLists.txt b/tools/qmllint/.prev_CMakeLists.txt
index cdc76dd106..4dcfce16e8 100644
--- a/tools/qmllint/.prev_CMakeLists.txt
+++ b/tools/qmllint/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## qmllint Tool:
#####################################################################
-add_qt_tool(qmllint
+qt_add_tool(qmllint
SOURCES
componentversion.cpp componentversion.h
fakemetaobject.cpp fakemetaobject.h
diff --git a/tools/qmllint/CMakeLists.txt b/tools/qmllint/CMakeLists.txt
index 949e6e51fa..80a5f11128 100644
--- a/tools/qmllint/CMakeLists.txt
+++ b/tools/qmllint/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmllint Tool:
#####################################################################
-add_qt_tool(qmllint
+qt_add_tool(qmllint
TOOLS_TARGET Qml # special case
SOURCES
componentversion.cpp componentversion.h
diff --git a/tools/qmlmin/.prev_CMakeLists.txt b/tools/qmlmin/.prev_CMakeLists.txt
index 39df27a3bd..6e897137ba 100644
--- a/tools/qmlmin/.prev_CMakeLists.txt
+++ b/tools/qmlmin/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## qmlmin Tool:
#####################################################################
-add_qt_tool(qmlmin
+qt_add_tool(qmlmin
SOURCES
main.cpp
LIBRARIES
diff --git a/tools/qmlmin/CMakeLists.txt b/tools/qmlmin/CMakeLists.txt
index 73d764aace..51ea6b52b6 100644
--- a/tools/qmlmin/CMakeLists.txt
+++ b/tools/qmlmin/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmlmin Tool:
#####################################################################
-add_qt_tool(qmlmin
+qt_add_tool(qmlmin
TOOLS_TARGET Qml # special case
SOURCES
main.cpp
diff --git a/tools/qmlplugindump/.prev_CMakeLists.txt b/tools/qmlplugindump/.prev_CMakeLists.txt
index 561a1cc6d9..90fd3d2ebb 100644
--- a/tools/qmlplugindump/.prev_CMakeLists.txt
+++ b/tools/qmlplugindump/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## qmlplugindump Tool:
#####################################################################
-add_qt_tool(qmlplugindump
+qt_add_tool(qmlplugindump
SOURCES
main.cpp
qmlstreamwriter.cpp qmlstreamwriter.h
@@ -26,12 +26,12 @@ add_qt_tool(qmlplugindump
## Scopes:
#####################################################################
-extend_target(qmlplugindump CONDITION TARGET Qt::Widgets
+qt_extend_target(qmlplugindump CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)
-extend_target(qmlplugindump CONDITION APPLE_OSX
+qt_extend_target(qmlplugindump CONDITION APPLE_OSX
LINK_OPTIONS
"-Wl,-sectcreate,__TEXT,__info_plist,$$shell_quote$$PWD/Info.plist"
)
diff --git a/tools/qmlplugindump/CMakeLists.txt b/tools/qmlplugindump/CMakeLists.txt
index 57f96a1f94..887fe0999e 100644
--- a/tools/qmlplugindump/CMakeLists.txt
+++ b/tools/qmlplugindump/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmlplugindump Tool:
#####################################################################
-add_qt_tool(qmlplugindump
+qt_add_tool(qmlplugindump
TOOLS_TARGET Qml # special case
SOURCES
main.cpp
@@ -27,12 +27,12 @@ add_qt_tool(qmlplugindump
## Scopes:
#####################################################################
-extend_target(qmlplugindump CONDITION TARGET Qt::Widgets
+qt_extend_target(qmlplugindump CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)
-extend_target(qmlplugindump CONDITION APPLE_OSX
+qt_extend_target(qmlplugindump CONDITION APPLE_OSX
LINK_OPTIONS
"-Wl,-sectcreate,__TEXT,__info_plist,${CMAKE_CURRENT_SOURCE_DIR}/Info.plist" # special case
)
diff --git a/tools/qmlpreview/.prev_CMakeLists.txt b/tools/qmlpreview/.prev_CMakeLists.txt
index c1c40d5fbf..87754e3ff0 100644
--- a/tools/qmlpreview/.prev_CMakeLists.txt
+++ b/tools/qmlpreview/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## qmlpreview Tool:
#####################################################################
-add_qt_tool(qmlpreview
+qt_add_tool(qmlpreview
SOURCES
main.cpp
qmlpreviewapplication.cpp qmlpreviewapplication.h
diff --git a/tools/qmlpreview/CMakeLists.txt b/tools/qmlpreview/CMakeLists.txt
index 7e0b808f2c..b0885beee1 100644
--- a/tools/qmlpreview/CMakeLists.txt
+++ b/tools/qmlpreview/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmlpreview Tool:
#####################################################################
-add_qt_tool(qmlpreview
+qt_add_tool(qmlpreview
TOOLS_TARGET Qml # special case
SOURCES
main.cpp
diff --git a/tools/qmlprofiler/.prev_CMakeLists.txt b/tools/qmlprofiler/.prev_CMakeLists.txt
index 1d6ac20ad6..f182f00b01 100644
--- a/tools/qmlprofiler/.prev_CMakeLists.txt
+++ b/tools/qmlprofiler/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## qmlprofiler Tool:
#####################################################################
-add_qt_tool(qmlprofiler
+qt_add_tool(qmlprofiler
SOURCES
commandlistener.cpp commandlistener.h
constants.h
diff --git a/tools/qmlprofiler/CMakeLists.txt b/tools/qmlprofiler/CMakeLists.txt
index 672a782136..6ff683926b 100644
--- a/tools/qmlprofiler/CMakeLists.txt
+++ b/tools/qmlprofiler/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmlprofiler Tool:
#####################################################################
-add_qt_tool(qmlprofiler
+qt_add_tool(qmlprofiler
TOOLS_TARGET Qml # special case
SOURCES
commandlistener.cpp commandlistener.h
diff --git a/tools/qmlscene/.prev_CMakeLists.txt b/tools/qmlscene/.prev_CMakeLists.txt
index da19ae27bb..c56301e359 100644
--- a/tools/qmlscene/.prev_CMakeLists.txt
+++ b/tools/qmlscene/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## qmlscene Tool:
#####################################################################
-add_qt_tool(qmlscene
+qt_add_tool(qmlscene
SOURCES
main.cpp
DEFINES
@@ -25,12 +25,12 @@ add_qt_tool(qmlscene
## Scopes:
#####################################################################
-extend_target(qmlscene CONDITION TARGET Qt::Widgets
+qt_extend_target(qmlscene CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)
-extend_target(qmlscene CONDITION QT_FEATURE_qml_debug
+qt_extend_target(qmlscene CONDITION QT_FEATURE_qml_debug
DEFINES
QT_QML_DEBUG_NO_WARNING
)
diff --git a/tools/qmlscene/CMakeLists.txt b/tools/qmlscene/CMakeLists.txt
index 1414009587..4212c627d4 100644
--- a/tools/qmlscene/CMakeLists.txt
+++ b/tools/qmlscene/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmlscene Tool:
#####################################################################
-add_qt_tool(qmlscene
+qt_add_tool(qmlscene
TOOLS_TARGET Qml # special case
SOURCES
main.cpp
@@ -26,12 +26,12 @@ add_qt_tool(qmlscene
## Scopes:
#####################################################################
-extend_target(qmlscene CONDITION TARGET Qt::Widgets
+qt_extend_target(qmlscene CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)
-extend_target(qmlscene CONDITION QT_FEATURE_qml_debug
+qt_extend_target(qmlscene CONDITION QT_FEATURE_qml_debug
DEFINES
QT_QML_DEBUG_NO_WARNING
)
diff --git a/tools/qmltestrunner/.prev_CMakeLists.txt b/tools/qmltestrunner/.prev_CMakeLists.txt
index c02d6e0226..0033cc0679 100644
--- a/tools/qmltestrunner/.prev_CMakeLists.txt
+++ b/tools/qmltestrunner/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## qmltestrunner Tool:
#####################################################################
-add_qt_tool(qmltestrunner
+qt_add_tool(qmltestrunner
SOURCES
main.cpp
PUBLIC_LIBRARIES
diff --git a/tools/qmltestrunner/CMakeLists.txt b/tools/qmltestrunner/CMakeLists.txt
index 0823d57c00..03d6cb77fb 100644
--- a/tools/qmltestrunner/CMakeLists.txt
+++ b/tools/qmltestrunner/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmltestrunner Tool:
#####################################################################
-add_qt_tool(qmltestrunner
+qt_add_tool(qmltestrunner
TOOLS_TARGET Qml # special case
SOURCES
main.cpp
diff --git a/tools/qmltime/CMakeLists.txt b/tools/qmltime/CMakeLists.txt
index 77b3e59368..4fb203cfbe 100644
--- a/tools/qmltime/CMakeLists.txt
+++ b/tools/qmltime/CMakeLists.txt
@@ -4,7 +4,7 @@
## qmltime Binary:
#####################################################################
-add_qt_executable(qmltime
+qt_add_executable(qmltime
GUI
SOURCES
qmltime.cpp