From ed65d1ab49e6f5537b086178f9f9d14fc190b663 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 23 Sep 2020 11:34:07 +0200 Subject: CMake: Regenerate projects to use new qt_internal_ API Modify special case locations to use the new API as well. Task-number: QTBUG-86815 Change-Id: I4a690095fcd4b1141550de86b6820ae2dd579429 Reviewed-by: Cristian Adam --- src/imports/controls/.prev_CMakeLists.txt | 4 ++-- src/imports/controls/CMakeLists.txt | 4 ++-- src/imports/controls/basic/.prev_CMakeLists.txt | 4 ++-- src/imports/controls/basic/CMakeLists.txt | 4 ++-- src/imports/controls/basic/impl/CMakeLists.txt | 2 +- src/imports/controls/fusion/.prev_CMakeLists.txt | 8 ++++++-- src/imports/controls/fusion/CMakeLists.txt | 9 ++++++--- src/imports/controls/fusion/impl/CMakeLists.txt | 2 +- src/imports/controls/imagine/.prev_CMakeLists.txt | 8 ++++++-- src/imports/controls/imagine/CMakeLists.txt | 8 ++++++-- src/imports/controls/imagine/impl/CMakeLists.txt | 4 ++-- src/imports/controls/macos/.prev_CMakeLists.txt | 6 +++++- src/imports/controls/macos/CMakeLists.txt | 5 ++++- src/imports/controls/material/.prev_CMakeLists.txt | 8 ++++++-- src/imports/controls/material/CMakeLists.txt | 7 +++++-- src/imports/controls/material/impl/CMakeLists.txt | 2 +- .../controls/universal/.prev_CMakeLists.txt | 8 ++++++-- src/imports/controls/universal/CMakeLists.txt | 7 +++++-- src/imports/controls/universal/impl/CMakeLists.txt | 2 +- src/imports/controls/windows/.prev_CMakeLists.txt | 6 +++++- src/imports/controls/windows/CMakeLists.txt | 5 ++++- src/imports/controlsimpl/.prev_CMakeLists.txt | 2 +- src/imports/controlsimpl/CMakeLists.txt | 2 +- src/imports/nativestyle/CMakeLists.txt | 8 ++++---- src/imports/platform/CMakeLists.txt | 22 +++++++++++----------- src/imports/templates/.prev_CMakeLists.txt | 2 +- src/imports/templates/CMakeLists.txt | 2 +- src/quickcontrols2/CMakeLists.txt | 2 +- src/quickcontrols2impl/CMakeLists.txt | 4 ++-- src/quicktemplates2/CMakeLists.txt | 6 +++--- tests/auto/accessibility/CMakeLists.txt | 6 +++--- tests/auto/controls/basic/CMakeLists.txt | 2 +- tests/auto/controls/fusion/CMakeLists.txt | 2 +- tests/auto/controls/imagine/CMakeLists.txt | 2 +- tests/auto/controls/material/CMakeLists.txt | 2 +- tests/auto/controls/universal/CMakeLists.txt | 2 +- tests/auto/cursor/CMakeLists.txt | 6 +++--- tests/auto/customization/CMakeLists.txt | 6 +++--- tests/auto/designer/CMakeLists.txt | 2 +- tests/auto/focus/CMakeLists.txt | 6 +++--- tests/auto/font/CMakeLists.txt | 6 +++--- tests/auto/palette/CMakeLists.txt | 8 ++++---- tests/auto/platform/CMakeLists.txt | 2 +- tests/auto/pressandhold/CMakeLists.txt | 2 +- tests/auto/qquickapplicationwindow/CMakeLists.txt | 6 +++--- tests/auto/qquickcolor/CMakeLists.txt | 2 +- tests/auto/qquickcontrol/CMakeLists.txt | 6 +++--- tests/auto/qquickdrawer/CMakeLists.txt | 6 +++--- tests/auto/qquickheaderview/CMakeLists.txt | 6 +++--- tests/auto/qquickiconimage/CMakeLists.txt | 10 +++++----- tests/auto/qquickiconlabel/CMakeLists.txt | 6 +++--- tests/auto/qquickimaginestyle/CMakeLists.txt | 4 ++-- tests/auto/qquickmaterialstyle/CMakeLists.txt | 4 ++-- tests/auto/qquickmaterialstyleconf/CMakeLists.txt | 8 ++++---- tests/auto/qquickmenu/CMakeLists.txt | 6 +++--- tests/auto/qquickmenubar/CMakeLists.txt | 6 +++--- tests/auto/qquickninepatchimage/CMakeLists.txt | 6 +++--- tests/auto/qquickpopup/CMakeLists.txt | 6 +++--- tests/auto/qquickstyle/CMakeLists.txt | 8 ++++---- tests/auto/qquickuniversalstyle/CMakeLists.txt | 4 ++-- tests/auto/qquickuniversalstyleconf/CMakeLists.txt | 8 ++++---- tests/auto/revisions/CMakeLists.txt | 2 +- tests/auto/sanity/CMakeLists.txt | 6 +++--- tests/auto/snippets/CMakeLists.txt | 4 ++-- tests/auto/styleimports/.prev_CMakeLists.txt | 8 ++++---- tests/auto/styleimports/CMakeLists.txt | 8 ++++---- .../styleimportscompiletimematerial/CMakeLists.txt | 6 +++--- .../styleimportscompiletimeqmlonly/CMakeLists.txt | 6 +++--- tests/auto/translation/CMakeLists.txt | 8 ++++---- tests/benchmarks/creationtime/CMakeLists.txt | 6 +++--- tests/benchmarks/objectcount/CMakeLists.txt | 6 +++--- 71 files changed, 211 insertions(+), 168 deletions(-) diff --git a/src/imports/controls/.prev_CMakeLists.txt b/src/imports/controls/.prev_CMakeLists.txt index b927521b..d2731194 100644 --- a/src/imports/controls/.prev_CMakeLists.txt +++ b/src/imports/controls/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2plugin Plugin: ##################################################################### -qt_add_qml_module(qtquickcontrols2plugin +qt_internal_add_qml_module(qtquickcontrols2plugin URI "QtQuick.Controls" VERSION "${CMAKE_PROJECT_VERSION}" DESIGNER_SUPPORTED @@ -39,7 +39,7 @@ qt_add_qml_module(qtquickcontrols2plugin ## Scopes: ##################################################################### -qt_add_docs(qtquickcontrols2plugin +qt_internal_add_docs(qtquickcontrols2plugin doc/qtquickcontrols.qdocconf ) diff --git a/src/imports/controls/CMakeLists.txt b/src/imports/controls/CMakeLists.txt index bc5fbaa0..91517ef9 100644 --- a/src/imports/controls/CMakeLists.txt +++ b/src/imports/controls/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2plugin Plugin: ##################################################################### -qt_add_qml_module(qtquickcontrols2plugin +qt_internal_add_qml_module(qtquickcontrols2plugin URI "QtQuick.Controls" VERSION "6.0" # special case DESIGNER_SUPPORTED @@ -39,7 +39,7 @@ qt_add_qml_module(qtquickcontrols2plugin ## Scopes: ##################################################################### -qt_add_docs(qtquickcontrols2plugin +qt_internal_add_docs(qtquickcontrols2plugin doc/qtquickcontrols.qdocconf ) diff --git a/src/imports/controls/basic/.prev_CMakeLists.txt b/src/imports/controls/basic/.prev_CMakeLists.txt index c9a11827..28c0d398 100644 --- a/src/imports/controls/basic/.prev_CMakeLists.txt +++ b/src/imports/controls/basic/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2basicstyleplugin Plugin: ##################################################################### -qt_add_qml_module(qtquickcontrols2basicstyleplugin +qt_internal_add_qml_module(qtquickcontrols2basicstyleplugin URI "QtQuick.Controls.Basic" VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickControls2BasicStylePlugin @@ -54,7 +54,7 @@ set(qtquickcontrols2basicstyleplugin_resource_files "images/drop-indicator@4x.png" ) -qt_add_resource(qtquickcontrols2basicstyleplugin "qtquickcontrols2basicstyleplugin" +qt_internal_add_resource(qtquickcontrols2basicstyleplugin "qtquickcontrols2basicstyleplugin" PREFIX "/qt-project.org/imports/QtQuick/Controls/Basic" FILES diff --git a/src/imports/controls/basic/CMakeLists.txt b/src/imports/controls/basic/CMakeLists.txt index 9e2252d4..aded888b 100644 --- a/src/imports/controls/basic/CMakeLists.txt +++ b/src/imports/controls/basic/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2basicstyleplugin Plugin: ##################################################################### -qt_add_qml_module(qtquickcontrols2basicstyleplugin +qt_internal_add_qml_module(qtquickcontrols2basicstyleplugin URI "QtQuick.Controls.Basic" VERSION "6.0" # special case CLASSNAME QtQuickControls2BasicStylePlugin @@ -54,7 +54,7 @@ set(qtquickcontrols2basicstyleplugin_resource_files "images/drop-indicator@4x.png" ) -qt_add_resource(qtquickcontrols2basicstyleplugin "qtquickcontrols2basicstyleplugin" +qt_internal_add_resource(qtquickcontrols2basicstyleplugin "qtquickcontrols2basicstyleplugin" PREFIX "/qt-project.org/imports/QtQuick/Controls/Basic" FILES diff --git a/src/imports/controls/basic/impl/CMakeLists.txt b/src/imports/controls/basic/impl/CMakeLists.txt index 08bffb5d..27c56e7f 100644 --- a/src/imports/controls/basic/impl/CMakeLists.txt +++ b/src/imports/controls/basic/impl/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2basicstyleimplplugin Plugin: ##################################################################### -qt_add_qml_module(qtquickcontrols2basicstyleimplplugin +qt_internal_add_qml_module(qtquickcontrols2basicstyleimplplugin URI "QtQuick.Controls.Basic.impl" VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickControls2BasicStyleImplPlugin diff --git a/src/imports/controls/fusion/.prev_CMakeLists.txt b/src/imports/controls/fusion/.prev_CMakeLists.txt index c5c31515..a1e79784 100644 --- a/src/imports/controls/fusion/.prev_CMakeLists.txt +++ b/src/imports/controls/fusion/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2fusionstyleplugin Plugin: ##################################################################### -qt_add_qml_module(qtquickcontrols2fusionstyleplugin +qt_internal_add_qml_module(qtquickcontrols2fusionstyleplugin URI "QtQuick.Controls.Fusion" VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickControls2FusionStylePlugin @@ -48,7 +48,7 @@ set(qtquickcontrols2fusionstyle_resource_files "images/progressmask@4x.png" ) -qt_add_resource(qtquickcontrols2fusionstyleplugin "qtquickcontrols2fusionstyle" +qt_internal_add_resource(qtquickcontrols2fusionstyleplugin "qtquickcontrols2fusionstyle" PREFIX "/qt-project.org/imports/QtQuick/Controls/Fusion" FILES @@ -95,6 +95,7 @@ set(qml_files "RangeSlider.qml" "RoundButton.qml" "ScrollBar.qml" + "ScrollView.qml" "ScrollIndicator.qml" "Slider.qml" "SpinBox.qml" @@ -206,6 +207,9 @@ set_source_files_properties(RoundButton.qml PROPERTIES set_source_files_properties(ScrollBar.qml PROPERTIES QT_QML_SOURCE_VERSION "2.0;6.0" ) +set_source_files_properties(ScrollView.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) set_source_files_properties(ScrollIndicator.qml PROPERTIES QT_QML_SOURCE_VERSION "2.0;6.0" ) diff --git a/src/imports/controls/fusion/CMakeLists.txt b/src/imports/controls/fusion/CMakeLists.txt index 1f9aaa9e..cd2db561 100644 --- a/src/imports/controls/fusion/CMakeLists.txt +++ b/src/imports/controls/fusion/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2fusionstyleplugin Plugin: ##################################################################### -qt_add_qml_module(qtquickcontrols2fusionstyleplugin +qt_internal_add_qml_module(qtquickcontrols2fusionstyleplugin URI "QtQuick.Controls.Fusion" VERSION "6.0" # special case CLASSNAME QtQuickControls2FusionStylePlugin @@ -48,7 +48,7 @@ set(qtquickcontrols2fusionstyle_resource_files "images/progressmask@4x.png" ) -qt_add_resource(qtquickcontrols2fusionstyleplugin "qtquickcontrols2fusionstyle" +qt_internal_add_resource(qtquickcontrols2fusionstyleplugin "qtquickcontrols2fusionstyle" PREFIX "/qt-project.org/imports/QtQuick/Controls/Fusion" FILES @@ -94,8 +94,8 @@ set(qml_files "RadioDelegate.qml" "RangeSlider.qml" "RoundButton.qml" - "ScrollView.qml" "ScrollBar.qml" + "ScrollView.qml" "ScrollIndicator.qml" "Slider.qml" "SpinBox.qml" @@ -207,6 +207,9 @@ set_source_files_properties(RoundButton.qml PROPERTIES set_source_files_properties(ScrollBar.qml PROPERTIES QT_QML_SOURCE_VERSION "2.0;6.0" ) +set_source_files_properties(ScrollView.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) set_source_files_properties(ScrollIndicator.qml PROPERTIES QT_QML_SOURCE_VERSION "2.0;6.0" ) diff --git a/src/imports/controls/fusion/impl/CMakeLists.txt b/src/imports/controls/fusion/impl/CMakeLists.txt index 628c5f90..44813a70 100644 --- a/src/imports/controls/fusion/impl/CMakeLists.txt +++ b/src/imports/controls/fusion/impl/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2fusionstyleimplplugin Plugin: ##################################################################### -qt_add_qml_module(qtquickcontrols2fusionstyleimplplugin +qt_internal_add_qml_module(qtquickcontrols2fusionstyleimplplugin URI "QtQuick.Controls.Fusion.impl" VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickControls2FusionStyleImpPlugin diff --git a/src/imports/controls/imagine/.prev_CMakeLists.txt b/src/imports/controls/imagine/.prev_CMakeLists.txt index 8d08bcca..832e87e6 100644 --- a/src/imports/controls/imagine/.prev_CMakeLists.txt +++ b/src/imports/controls/imagine/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2imaginestyleplugin Plugin: ##################################################################### -qt_add_qml_module(qtquickcontrols2imaginestyleplugin +qt_internal_add_qml_module(qtquickcontrols2imaginestyleplugin URI "QtQuick.Controls.Imagine" VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickControls2ImagineStylePlugin @@ -49,7 +49,7 @@ set(qmake_qtquickcontrols2imaginestyle_resource_files ${resource_glob_1} ) -qt_add_resource(qtquickcontrols2imaginestyleplugin "qmake_qtquickcontrols2imaginestyle" +qt_internal_add_resource(qtquickcontrols2imaginestyleplugin "qmake_qtquickcontrols2imaginestyle" PREFIX "qt-project.org/imports/QtQuick/Controls/Imagine" FILES @@ -93,6 +93,7 @@ set(qml_files "RadioDelegate.qml" "RangeSlider.qml" "RoundButton.qml" + "ScrollView.qml" "ScrollBar.qml" "ScrollIndicator.qml" "Slider.qml" @@ -198,6 +199,9 @@ set_source_files_properties(RangeSlider.qml PROPERTIES set_source_files_properties(RoundButton.qml PROPERTIES QT_QML_SOURCE_VERSION "2.1;6.0" ) +set_source_files_properties(ScrollView.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) set_source_files_properties(ScrollBar.qml PROPERTIES QT_QML_SOURCE_VERSION "2.0;6.0" ) diff --git a/src/imports/controls/imagine/CMakeLists.txt b/src/imports/controls/imagine/CMakeLists.txt index cb4726e9..d49c3977 100644 --- a/src/imports/controls/imagine/CMakeLists.txt +++ b/src/imports/controls/imagine/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2imaginestyleplugin Plugin: ##################################################################### -qt_add_qml_module(qtquickcontrols2imaginestyleplugin +qt_internal_add_qml_module(qtquickcontrols2imaginestyleplugin URI "QtQuick.Controls.Imagine" VERSION "6.0" # special case CLASSNAME QtQuickControls2ImagineStylePlugin @@ -49,7 +49,7 @@ set(qmake_qtquickcontrols2imaginestyle_resource_files ${resource_glob_1} ) -qt_add_resource(qtquickcontrols2imaginestyleplugin "qmake_qtquickcontrols2imaginestyle" +qt_internal_add_resource(qtquickcontrols2imaginestyleplugin "qmake_qtquickcontrols2imaginestyle" PREFIX "qt-project.org/imports/QtQuick/Controls/Imagine" FILES @@ -93,6 +93,7 @@ set(qml_files "RadioDelegate.qml" "RangeSlider.qml" "RoundButton.qml" + "ScrollView.qml" "ScrollBar.qml" "ScrollIndicator.qml" "Slider.qml" @@ -198,6 +199,9 @@ set_source_files_properties(RangeSlider.qml PROPERTIES set_source_files_properties(RoundButton.qml PROPERTIES QT_QML_SOURCE_VERSION "2.1;6.0" ) +set_source_files_properties(ScrollView.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) set_source_files_properties(ScrollBar.qml PROPERTIES QT_QML_SOURCE_VERSION "2.0;6.0" ) diff --git a/src/imports/controls/imagine/impl/CMakeLists.txt b/src/imports/controls/imagine/impl/CMakeLists.txt index ea75184a..5e02b5e3 100644 --- a/src/imports/controls/imagine/impl/CMakeLists.txt +++ b/src/imports/controls/imagine/impl/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2imaginestyleimplplugin Plugin: ##################################################################### -qt_add_qml_module(qtquickcontrols2imaginestyleimplplugin +qt_internal_add_qml_module(qtquickcontrols2imaginestyleimplplugin URI "QtQuick.Controls.Imagine.impl" VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickControls2ImagineStyleImplPlugin @@ -37,7 +37,7 @@ set(qmake_qtquickcontrols2imaginestyleimpl_resource_files "shaders/OpacityMask.frag" ) -qt_add_resource(qtquickcontrols2imaginestyleimplplugin "qmake_qtquickcontrols2imaginestyleimpl" +qt_internal_add_resource(qtquickcontrols2imaginestyleimplplugin "qmake_qtquickcontrols2imaginestyleimpl" PREFIX "qt-project.org/imports/QtQuick/Controls/Imagine/impl" FILES diff --git a/src/imports/controls/macos/.prev_CMakeLists.txt b/src/imports/controls/macos/.prev_CMakeLists.txt index a8fca854..53584ac4 100644 --- a/src/imports/controls/macos/.prev_CMakeLists.txt +++ b/src/imports/controls/macos/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2macosstyleplugin Plugin: ##################################################################### -qt_add_qml_module(qtquickcontrols2macosstyleplugin +qt_internal_add_qml_module(qtquickcontrols2macosstyleplugin URI "QtQuick.Controls.macOS" VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickControls2MacOSStylePlugin @@ -50,6 +50,7 @@ set(qml_files "Frame.qml" "TextArea.qml" "ComboBox.qml" + "ScrollView.qml" "ScrollBar.qml" "ProgressBar.qml" "Dial.qml" @@ -84,6 +85,9 @@ set_source_files_properties(TextArea.qml PROPERTIES set_source_files_properties(ComboBox.qml PROPERTIES QT_QML_SOURCE_VERSION "6.0" ) +set_source_files_properties(ScrollView.qml PROPERTIES + QT_QML_SOURCE_VERSION "6.0" +) set_source_files_properties(ScrollBar.qml PROPERTIES QT_QML_SOURCE_VERSION "6.0" ) diff --git a/src/imports/controls/macos/CMakeLists.txt b/src/imports/controls/macos/CMakeLists.txt index 1cb9ff86..ca335f34 100644 --- a/src/imports/controls/macos/CMakeLists.txt +++ b/src/imports/controls/macos/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2macosstyleplugin Plugin: ##################################################################### -qt_add_qml_module(qtquickcontrols2macosstyleplugin +qt_internal_add_qml_module(qtquickcontrols2macosstyleplugin URI "QtQuick.Controls.macOS" VERSION "6.0" # special case CLASSNAME QtQuickControls2MacOSStylePlugin @@ -85,6 +85,9 @@ set_source_files_properties(TextArea.qml PROPERTIES set_source_files_properties(ComboBox.qml PROPERTIES QT_QML_SOURCE_VERSION "6.0" ) +set_source_files_properties(ScrollView.qml PROPERTIES + QT_QML_SOURCE_VERSION "6.0" +) set_source_files_properties(ScrollBar.qml PROPERTIES QT_QML_SOURCE_VERSION "6.0" ) diff --git a/src/imports/controls/material/.prev_CMakeLists.txt b/src/imports/controls/material/.prev_CMakeLists.txt index 3f82f1e4..2547a0f8 100644 --- a/src/imports/controls/material/.prev_CMakeLists.txt +++ b/src/imports/controls/material/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2materialstyleplugin Plugin: ##################################################################### -qt_add_qml_module(qtquickcontrols2materialstyleplugin +qt_internal_add_qml_module(qtquickcontrols2materialstyleplugin URI "QtQuick.Controls.Material" VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickControls2MaterialStylePlugin @@ -53,7 +53,7 @@ set(qtquickcontrols2materialstyleplugin_resource_files "shaders/RectangularGlow.frag" ) -qt_add_resource(qtquickcontrols2materialstyleplugin "qtquickcontrols2materialstyleplugin" +qt_internal_add_resource(qtquickcontrols2materialstyleplugin "qtquickcontrols2materialstyleplugin" PREFIX "/qt-project.org/imports/QtQuick/Controls/Material" FILES @@ -99,6 +99,7 @@ set(qml_files "RadioDelegate.qml" "RangeSlider.qml" "RoundButton.qml" + "ScrollView.qml" "ScrollBar.qml" "ScrollIndicator.qml" "Slider.qml" @@ -210,6 +211,9 @@ set_source_files_properties(RangeSlider.qml PROPERTIES set_source_files_properties(RoundButton.qml PROPERTIES QT_QML_SOURCE_VERSION "2.1;6.0" ) +set_source_files_properties(ScrollView.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) set_source_files_properties(ScrollBar.qml PROPERTIES QT_QML_SOURCE_VERSION "2.0;6.0" ) diff --git a/src/imports/controls/material/CMakeLists.txt b/src/imports/controls/material/CMakeLists.txt index 9b70b6b5..7ba455e7 100644 --- a/src/imports/controls/material/CMakeLists.txt +++ b/src/imports/controls/material/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2materialstyleplugin Plugin: ##################################################################### -qt_add_qml_module(qtquickcontrols2materialstyleplugin +qt_internal_add_qml_module(qtquickcontrols2materialstyleplugin URI "QtQuick.Controls.Material" VERSION "6.0" # special case CLASSNAME QtQuickControls2MaterialStylePlugin @@ -53,7 +53,7 @@ set(qtquickcontrols2materialstyleplugin_resource_files "shaders/RectangularGlow.frag" ) -qt_add_resource(qtquickcontrols2materialstyleplugin "qtquickcontrols2materialstyleplugin" +qt_internal_add_resource(qtquickcontrols2materialstyleplugin "qtquickcontrols2materialstyleplugin" PREFIX "/qt-project.org/imports/QtQuick/Controls/Material" FILES @@ -211,6 +211,9 @@ set_source_files_properties(RangeSlider.qml PROPERTIES set_source_files_properties(RoundButton.qml PROPERTIES QT_QML_SOURCE_VERSION "2.1;6.0" ) +set_source_files_properties(ScrollView.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) set_source_files_properties(ScrollBar.qml PROPERTIES QT_QML_SOURCE_VERSION "2.0;6.0" ) diff --git a/src/imports/controls/material/impl/CMakeLists.txt b/src/imports/controls/material/impl/CMakeLists.txt index bcb4f998..1f47650c 100644 --- a/src/imports/controls/material/impl/CMakeLists.txt +++ b/src/imports/controls/material/impl/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2materialstyleimplplugin Plugin: ##################################################################### -qt_add_qml_module(qtquickcontrols2materialstyleimplplugin +qt_internal_add_qml_module(qtquickcontrols2materialstyleimplplugin URI "QtQuick.Controls.Material.impl" VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickControls2MaterialStyleImplPlugin diff --git a/src/imports/controls/universal/.prev_CMakeLists.txt b/src/imports/controls/universal/.prev_CMakeLists.txt index f668d683..ce19c5d2 100644 --- a/src/imports/controls/universal/.prev_CMakeLists.txt +++ b/src/imports/controls/universal/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2universalstyleplugin Plugin: ##################################################################### -qt_add_qml_module(qtquickcontrols2universalstyleplugin +qt_internal_add_qml_module(qtquickcontrols2universalstyleplugin URI "QtQuick.Controls.Universal" VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickControls2UniversalStylePlugin @@ -53,7 +53,7 @@ set(qtquickcontrols2universalstyleplugin_resource_files "images/rightarrow@4x.png" ) -qt_add_resource(qtquickcontrols2universalstyleplugin "qtquickcontrols2universalstyleplugin" +qt_internal_add_resource(qtquickcontrols2universalstyleplugin "qtquickcontrols2universalstyleplugin" PREFIX "/qt-project.org/imports/QtQuick/Controls/Universal" FILES @@ -99,6 +99,7 @@ set(qml_files "RadioDelegate.qml" "RangeSlider.qml" "RoundButton.qml" + "ScrollView.qml" "ScrollBar.qml" "ScrollIndicator.qml" "Slider.qml" @@ -209,6 +210,9 @@ set_source_files_properties(RangeSlider.qml PROPERTIES set_source_files_properties(RoundButton.qml PROPERTIES QT_QML_SOURCE_VERSION "2.1;6.0" ) +set_source_files_properties(ScrollView.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) set_source_files_properties(ScrollBar.qml PROPERTIES QT_QML_SOURCE_VERSION "2.0;6.0" ) diff --git a/src/imports/controls/universal/CMakeLists.txt b/src/imports/controls/universal/CMakeLists.txt index 6a27f536..64cf5d75 100644 --- a/src/imports/controls/universal/CMakeLists.txt +++ b/src/imports/controls/universal/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2universalstyleplugin Plugin: ##################################################################### -qt_add_qml_module(qtquickcontrols2universalstyleplugin +qt_internal_add_qml_module(qtquickcontrols2universalstyleplugin URI "QtQuick.Controls.Universal" VERSION "6.0" # special case CLASSNAME QtQuickControls2UniversalStylePlugin @@ -53,7 +53,7 @@ set(qtquickcontrols2universalstyleplugin_resource_files "images/rightarrow@4x.png" ) -qt_add_resource(qtquickcontrols2universalstyleplugin "qtquickcontrols2universalstyleplugin" +qt_internal_add_resource(qtquickcontrols2universalstyleplugin "qtquickcontrols2universalstyleplugin" PREFIX "/qt-project.org/imports/QtQuick/Controls/Universal" FILES @@ -210,6 +210,9 @@ set_source_files_properties(RangeSlider.qml PROPERTIES set_source_files_properties(RoundButton.qml PROPERTIES QT_QML_SOURCE_VERSION "2.1;6.0" ) +set_source_files_properties(ScrollView.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) set_source_files_properties(ScrollBar.qml PROPERTIES QT_QML_SOURCE_VERSION "2.0;6.0" ) diff --git a/src/imports/controls/universal/impl/CMakeLists.txt b/src/imports/controls/universal/impl/CMakeLists.txt index 6172b908..72572fab 100644 --- a/src/imports/controls/universal/impl/CMakeLists.txt +++ b/src/imports/controls/universal/impl/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2universalstyleimplplugin Plugin: ##################################################################### -qt_add_qml_module(qtquickcontrols2universalstyleimplplugin +qt_internal_add_qml_module(qtquickcontrols2universalstyleimplplugin URI "QtQuick.Controls.Universal.impl" VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickControls2UniversalStyleImplPlugin diff --git a/src/imports/controls/windows/.prev_CMakeLists.txt b/src/imports/controls/windows/.prev_CMakeLists.txt index d68839b2..cd34864d 100644 --- a/src/imports/controls/windows/.prev_CMakeLists.txt +++ b/src/imports/controls/windows/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2windowsstyleplugin Plugin: ##################################################################### -qt_add_qml_module(qtquickcontrols2windowsstyleplugin +qt_internal_add_qml_module(qtquickcontrols2windowsstyleplugin URI "QtQuick.Controls.Windows" VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickControls2WindowsStylePlugin @@ -51,6 +51,7 @@ set(qml_files "SpinBox.qml" "TextArea.qml" "TextField.qml" + "ScrollView.qml" ) set_source_files_properties(Button.qml PROPERTIES QT_QML_SOURCE_VERSION "6.0" @@ -85,6 +86,9 @@ set_source_files_properties(TextArea.qml PROPERTIES set_source_files_properties(TextField.qml PROPERTIES QT_QML_SOURCE_VERSION "6.0" ) +set_source_files_properties(ScrollView.qml PROPERTIES + QT_QML_SOURCE_VERSION "6.0" +) qt6_target_qml_files(qtquickcontrols2windowsstyleplugin FILES diff --git a/src/imports/controls/windows/CMakeLists.txt b/src/imports/controls/windows/CMakeLists.txt index 5e8ddb62..f1d01946 100644 --- a/src/imports/controls/windows/CMakeLists.txt +++ b/src/imports/controls/windows/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2windowsstyleplugin Plugin: ##################################################################### -qt_add_qml_module(qtquickcontrols2windowsstyleplugin +qt_internal_add_qml_module(qtquickcontrols2windowsstyleplugin URI "QtQuick.Controls.Windows" VERSION "6.0" # special case CLASSNAME QtQuickControls2WindowsStylePlugin @@ -86,6 +86,9 @@ set_source_files_properties(TextArea.qml PROPERTIES set_source_files_properties(TextField.qml PROPERTIES QT_QML_SOURCE_VERSION "6.0" ) +set_source_files_properties(ScrollView.qml PROPERTIES + QT_QML_SOURCE_VERSION "6.0" +) qt6_target_qml_files(qtquickcontrols2windowsstyleplugin FILES diff --git a/src/imports/controlsimpl/.prev_CMakeLists.txt b/src/imports/controlsimpl/.prev_CMakeLists.txt index ec51260d..9d8049f5 100644 --- a/src/imports/controlsimpl/.prev_CMakeLists.txt +++ b/src/imports/controlsimpl/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2implplugin Plugin: ##################################################################### -qt_add_qml_module(qtquickcontrols2implplugin +qt_internal_add_qml_module(qtquickcontrols2implplugin URI "QtQuick.Controls.impl" VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickControls2ImplPlugin diff --git a/src/imports/controlsimpl/CMakeLists.txt b/src/imports/controlsimpl/CMakeLists.txt index 86966168..3ffc396c 100644 --- a/src/imports/controlsimpl/CMakeLists.txt +++ b/src/imports/controlsimpl/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2implplugin Plugin: ##################################################################### -qt_add_qml_module(qtquickcontrols2implplugin +qt_internal_add_qml_module(qtquickcontrols2implplugin URI "QtQuick.Controls.impl" VERSION "6.0" # special case CLASSNAME QtQuickControls2ImplPlugin diff --git a/src/imports/nativestyle/CMakeLists.txt b/src/imports/nativestyle/CMakeLists.txt index d6021e04..f7fc0cb7 100644 --- a/src/imports/nativestyle/CMakeLists.txt +++ b/src/imports/nativestyle/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2nativestyleplugin Plugin: ##################################################################### -qt_add_qml_module(qtquickcontrols2nativestyleplugin +qt_internal_add_qml_module(qtquickcontrols2nativestyleplugin URI "QtQuick.NativeStyle" VERSION "6.0" CLASSNAME QtQuickControls2NativeStylePlugin @@ -66,7 +66,7 @@ qt_add_qml_module(qtquickcontrols2nativestyleplugin ## Scopes: ##################################################################### -qt_extend_target(qtquickcontrols2nativestyleplugin CONDITION MACOS +qt_internal_extend_target(qtquickcontrols2nativestyleplugin CONDITION MACOS SOURCES qstyle/mac/qquickmacstyle_mac.mm qstyle/mac/qquickmacstyle_mac_p.h qstyle/mac/qquickmacstyle_mac_p_p.h @@ -83,7 +83,7 @@ if(MACOS) "util/FocusFrame.qml" ) - qt_add_resource(qtquickcontrols2nativestyleplugin "qmake_immediate" + qt_internal_add_resource(qtquickcontrols2nativestyleplugin "qmake_immediate" PREFIX "/" FILES @@ -91,7 +91,7 @@ if(MACOS) ) endif() -qt_extend_target(qtquickcontrols2nativestyleplugin CONDITION WIN32 +qt_internal_extend_target(qtquickcontrols2nativestyleplugin CONDITION WIN32 SOURCES qstyle/windows/qquickwindowsstyle.cpp qstyle/windows/qquickwindowsstyle_p.h qstyle/windows/qquickwindowsstyle_p_p.h diff --git a/src/imports/platform/CMakeLists.txt b/src/imports/platform/CMakeLists.txt index 0db2f60d..92668739 100644 --- a/src/imports/platform/CMakeLists.txt +++ b/src/imports/platform/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtlabsplatformplugin Plugin: ##################################################################### -qt_add_qml_module(qtlabsplatformplugin +qt_internal_add_qml_module(qtlabsplatformplugin URI "Qt.labs.platform" VERSION "1.1" CLASSNAME QtLabsPlatformPlugin @@ -49,54 +49,54 @@ qt_add_qml_module(qtlabsplatformplugin ## Scopes: ##################################################################### -qt_extend_target(qtlabsplatformplugin CONDITION TARGET Qt::Widgets +qt_internal_extend_target(qtlabsplatformplugin CONDITION TARGET Qt::Widgets SOURCES widgets/qwidgetplatform_p.h PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_systemtrayicon AND TARGET Qt::Widgets +qt_internal_extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_systemtrayicon AND TARGET Qt::Widgets SOURCES widgets/qwidgetplatformsystemtrayicon.cpp widgets/qwidgetplatformsystemtrayicon_p.h ) -qt_extend_target(qtlabsplatformplugin CONDITION TARGET Qt::Widgets AND (QT_FEATURE_colordialog OR QT_FEATURE_filedialog OR QT_FEATURE_fontdialog OR QT_FEATURE_messagebox) +qt_internal_extend_target(qtlabsplatformplugin CONDITION TARGET Qt::Widgets AND (QT_FEATURE_colordialog OR QT_FEATURE_filedialog OR QT_FEATURE_fontdialog OR QT_FEATURE_messagebox) SOURCES widgets/qwidgetplatformdialog.cpp widgets/qwidgetplatformdialog_p.h ) -qt_extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets +qt_internal_extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets SOURCES widgets/qwidgetplatformcolordialog.cpp widgets/qwidgetplatformcolordialog_p.h ) -qt_extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_filedialog AND TARGET Qt::Widgets +qt_internal_extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_filedialog AND TARGET Qt::Widgets SOURCES widgets/qwidgetplatformfiledialog.cpp widgets/qwidgetplatformfiledialog_p.h ) -qt_extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets +qt_internal_extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets SOURCES widgets/qwidgetplatformfontdialog.cpp widgets/qwidgetplatformfontdialog_p.h ) -qt_extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_menu AND TARGET Qt::Widgets +qt_internal_extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_menu AND TARGET Qt::Widgets SOURCES widgets/qwidgetplatformmenu.cpp widgets/qwidgetplatformmenu_p.h widgets/qwidgetplatformmenuitem.cpp widgets/qwidgetplatformmenuitem_p.h ) -qt_extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_messagebox AND TARGET Qt::Widgets +qt_internal_extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_messagebox AND TARGET Qt::Widgets SOURCES widgets/qwidgetplatformmessagedialog.cpp widgets/qwidgetplatformmessagedialog_p.h ) -qt_extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_systemtrayicon +qt_internal_extend_target(qtlabsplatformplugin CONDITION QT_FEATURE_systemtrayicon SOURCES qquickplatformsystemtrayicon.cpp qquickplatformsystemtrayicon_p.h ) -qt_add_docs(qtlabsplatformplugin +qt_internal_add_docs(qtlabsplatformplugin doc/qtlabsplatform.qdocconf ) diff --git a/src/imports/templates/.prev_CMakeLists.txt b/src/imports/templates/.prev_CMakeLists.txt index 948a4327..7799ab66 100644 --- a/src/imports/templates/.prev_CMakeLists.txt +++ b/src/imports/templates/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquicktemplates2plugin Plugin: ##################################################################### -qt_add_qml_module(qtquicktemplates2plugin +qt_internal_add_qml_module(qtquicktemplates2plugin URI "QtQuick.Templates" VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickTemplates2Plugin diff --git a/src/imports/templates/CMakeLists.txt b/src/imports/templates/CMakeLists.txt index 4c250cae..aa4a1b37 100644 --- a/src/imports/templates/CMakeLists.txt +++ b/src/imports/templates/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquicktemplates2plugin Plugin: ##################################################################### -qt_add_qml_module(qtquicktemplates2plugin +qt_internal_add_qml_module(qtquicktemplates2plugin URI "QtQuick.Templates" VERSION "6.0" # special case CLASSNAME QtQuickTemplates2Plugin diff --git a/src/quickcontrols2/CMakeLists.txt b/src/quickcontrols2/CMakeLists.txt index 52e39cae..79b617b3 100644 --- a/src/quickcontrols2/CMakeLists.txt +++ b/src/quickcontrols2/CMakeLists.txt @@ -4,7 +4,7 @@ ## QuickControls2 Module: ##################################################################### -qt_add_module(QuickControls2 +qt_internal_add_module(QuickControls2 GENERATE_METATYPES SOURCES qquickdummyregistration_p.h diff --git a/src/quickcontrols2impl/CMakeLists.txt b/src/quickcontrols2impl/CMakeLists.txt index 48e3ab3d..6f952c5a 100644 --- a/src/quickcontrols2impl/CMakeLists.txt +++ b/src/quickcontrols2impl/CMakeLists.txt @@ -4,7 +4,7 @@ ## QuickControls2Impl Module: ##################################################################### -qt_add_module(QuickControls2Impl +qt_internal_add_module(QuickControls2Impl GENERATE_METATYPES SOURCES qquickanimatednode.cpp qquickanimatednode_p.h @@ -48,7 +48,7 @@ qt_add_module(QuickControls2Impl ## Scopes: ##################################################################### -qt_extend_target(QuickControls2Impl CONDITION QT_FEATURE_quick_listview AND QT_FEATURE_quick_pathview +qt_internal_extend_target(QuickControls2Impl CONDITION QT_FEATURE_quick_listview AND QT_FEATURE_quick_pathview SOURCES qquicktumblerview.cpp qquicktumblerview_p.h ) diff --git a/src/quicktemplates2/CMakeLists.txt b/src/quicktemplates2/CMakeLists.txt index ba48dd6e..5b71e91f 100644 --- a/src/quicktemplates2/CMakeLists.txt +++ b/src/quicktemplates2/CMakeLists.txt @@ -4,7 +4,7 @@ ## QuickTemplates2 Module: ##################################################################### -qt_add_module(QuickTemplates2 +qt_internal_add_module(QuickTemplates2 GENERATE_METATYPES SOURCES qquickabstractbutton.cpp qquickabstractbutton_p.h @@ -138,7 +138,7 @@ qt_add_module(QuickTemplates2 ## Scopes: ##################################################################### -qt_extend_target(QuickTemplates2 CONDITION TARGET Qt::QmlModels +qt_internal_extend_target(QuickTemplates2 CONDITION TARGET Qt::QmlModels LIBRARIES Qt::QmlModelsPrivate PUBLIC_LIBRARIES @@ -147,7 +147,7 @@ qt_extend_target(QuickTemplates2 CONDITION TARGET Qt::QmlModels Qt::QmlModelsPrivate ) -qt_extend_target(QuickTemplates2 CONDITION QT_FEATURE_quick_listview AND QT_FEATURE_quick_pathview +qt_internal_extend_target(QuickTemplates2 CONDITION QT_FEATURE_quick_listview AND QT_FEATURE_quick_pathview SOURCES qquicktumbler.cpp qquicktumbler_p.h qquicktumbler_p_p.h diff --git a/tests/auto/accessibility/CMakeLists.txt b/tests/auto/accessibility/CMakeLists.txt index 4ba2c566..fe2a35d6 100644 --- a/tests/auto/accessibility/CMakeLists.txt +++ b/tests/auto/accessibility/CMakeLists.txt @@ -14,7 +14,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_accessibility +qt_internal_add_test(tst_accessibility SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -42,12 +42,12 @@ qt_add_test(tst_accessibility ## Scopes: ##################################################################### -qt_extend_target(tst_accessibility CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_accessibility CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_accessibility CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_accessibility CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/controls/basic/CMakeLists.txt b/tests/auto/controls/basic/CMakeLists.txt index a7a4e29c..55112e1e 100644 --- a/tests/auto/controls/basic/CMakeLists.txt +++ b/tests/auto/controls/basic/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/../data/tst_*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_basic +qt_internal_add_test(tst_basic GUI QMLTEST SOURCES diff --git a/tests/auto/controls/fusion/CMakeLists.txt b/tests/auto/controls/fusion/CMakeLists.txt index fd348526..03c52605 100644 --- a/tests/auto/controls/fusion/CMakeLists.txt +++ b/tests/auto/controls/fusion/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/../data/tst_*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_fusion +qt_internal_add_test(tst_fusion GUI QMLTEST SOURCES diff --git a/tests/auto/controls/imagine/CMakeLists.txt b/tests/auto/controls/imagine/CMakeLists.txt index 9d7f2e3a..faef2e06 100644 --- a/tests/auto/controls/imagine/CMakeLists.txt +++ b/tests/auto/controls/imagine/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/../data/tst_*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_imagine +qt_internal_add_test(tst_imagine GUI QMLTEST SOURCES diff --git a/tests/auto/controls/material/CMakeLists.txt b/tests/auto/controls/material/CMakeLists.txt index 04c2655a..b8505b9b 100644 --- a/tests/auto/controls/material/CMakeLists.txt +++ b/tests/auto/controls/material/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/../data/tst_*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_material +qt_internal_add_test(tst_material GUI QMLTEST SOURCES diff --git a/tests/auto/controls/universal/CMakeLists.txt b/tests/auto/controls/universal/CMakeLists.txt index e5576020..5f9024cd 100644 --- a/tests/auto/controls/universal/CMakeLists.txt +++ b/tests/auto/controls/universal/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/../data/tst_*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_universal +qt_internal_add_test(tst_universal GUI QMLTEST SOURCES diff --git a/tests/auto/cursor/CMakeLists.txt b/tests/auto/cursor/CMakeLists.txt index 07d8a5f3..f7a22928 100644 --- a/tests/auto/cursor/CMakeLists.txt +++ b/tests/auto/cursor/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_cursor +qt_internal_add_test(tst_cursor SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -37,12 +37,12 @@ qt_add_test(tst_cursor ## Scopes: ##################################################################### -qt_extend_target(tst_cursor CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_cursor CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_cursor CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_cursor CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/customization/CMakeLists.txt b/tests/auto/customization/CMakeLists.txt index 0ec56d9d..70a7b88c 100644 --- a/tests/auto/customization/CMakeLists.txt +++ b/tests/auto/customization/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_customization +qt_internal_add_test(tst_customization SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -34,12 +34,12 @@ qt_add_test(tst_customization ## Scopes: ##################################################################### -qt_extend_target(tst_customization CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_customization CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_customization CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_customization CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/designer/CMakeLists.txt b/tests/auto/designer/CMakeLists.txt index 59e7c5a0..50331f8f 100644 --- a/tests/auto/designer/CMakeLists.txt +++ b/tests/auto/designer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_designer Test: ##################################################################### -qt_add_test(tst_designer +qt_internal_add_test(tst_designer SOURCES tst_designer.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/focus/CMakeLists.txt b/tests/auto/focus/CMakeLists.txt index 3e8234e9..404dcfa4 100644 --- a/tests/auto/focus/CMakeLists.txt +++ b/tests/auto/focus/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_focus +qt_internal_add_test(tst_focus SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -34,12 +34,12 @@ qt_add_test(tst_focus ## Scopes: ##################################################################### -qt_extend_target(tst_focus CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_focus CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_focus CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_focus CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/font/CMakeLists.txt b/tests/auto/font/CMakeLists.txt index 8529adb8..5cc92d88 100644 --- a/tests/auto/font/CMakeLists.txt +++ b/tests/auto/font/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_font +qt_internal_add_test(tst_font SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -37,12 +37,12 @@ qt_add_test(tst_font ## Scopes: ##################################################################### -qt_extend_target(tst_font CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_font CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_font CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_font CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/palette/CMakeLists.txt b/tests/auto/palette/CMakeLists.txt index 33f8b86b..6702ac8a 100644 --- a/tests/auto/palette/CMakeLists.txt +++ b/tests/auto/palette/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_palette +qt_internal_add_test(tst_palette SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -36,7 +36,7 @@ set(qmake_immediate_resource_files "qtquickcontrols2.conf" ) -qt_add_resource(tst_palette "qmake_immediate" +qt_internal_add_resource(tst_palette "qmake_immediate" PREFIX "/" FILES @@ -50,12 +50,12 @@ qt_add_resource(tst_palette "qmake_immediate" ## Scopes: ##################################################################### -qt_extend_target(tst_palette CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_palette CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_palette CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_palette CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/platform/CMakeLists.txt b/tests/auto/platform/CMakeLists.txt index ec4e54ee..6633de5c 100644 --- a/tests/auto/platform/CMakeLists.txt +++ b/tests/auto/platform/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/tst_*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_platform +qt_internal_add_test(tst_platform GUI QMLTEST SOURCES diff --git a/tests/auto/pressandhold/CMakeLists.txt b/tests/auto/pressandhold/CMakeLists.txt index 32793510..926d446f 100644 --- a/tests/auto/pressandhold/CMakeLists.txt +++ b/tests/auto/pressandhold/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_pressandhold Test: ##################################################################### -qt_add_test(tst_pressandhold +qt_internal_add_test(tst_pressandhold SOURCES tst_pressandhold.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qquickapplicationwindow/CMakeLists.txt b/tests/auto/qquickapplicationwindow/CMakeLists.txt index 6fa2e692..20268703 100644 --- a/tests/auto/qquickapplicationwindow/CMakeLists.txt +++ b/tests/auto/qquickapplicationwindow/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickapplicationwindow +qt_internal_add_test(tst_qquickapplicationwindow SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -37,12 +37,12 @@ qt_add_test(tst_qquickapplicationwindow ## Scopes: ##################################################################### -qt_extend_target(tst_qquickapplicationwindow CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickapplicationwindow CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickapplicationwindow CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickapplicationwindow CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickcolor/CMakeLists.txt b/tests/auto/qquickcolor/CMakeLists.txt index bf660d10..2cbbe9eb 100644 --- a/tests/auto/qquickcolor/CMakeLists.txt +++ b/tests/auto/qquickcolor/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/tst_*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickcolor +qt_internal_add_test(tst_qquickcolor GUI QMLTEST SOURCES diff --git a/tests/auto/qquickcontrol/CMakeLists.txt b/tests/auto/qquickcontrol/CMakeLists.txt index 0599ce32..5d6eefd2 100644 --- a/tests/auto/qquickcontrol/CMakeLists.txt +++ b/tests/auto/qquickcontrol/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickcontrol +qt_internal_add_test(tst_qquickcontrol SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -37,12 +37,12 @@ qt_add_test(tst_qquickcontrol ## Scopes: ##################################################################### -qt_extend_target(tst_qquickcontrol CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickcontrol CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickcontrol CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickcontrol CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickdrawer/CMakeLists.txt b/tests/auto/qquickdrawer/CMakeLists.txt index e428a86c..1c2342f0 100644 --- a/tests/auto/qquickdrawer/CMakeLists.txt +++ b/tests/auto/qquickdrawer/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickdrawer +qt_internal_add_test(tst_qquickdrawer SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -37,12 +37,12 @@ qt_add_test(tst_qquickdrawer ## Scopes: ##################################################################### -qt_extend_target(tst_qquickdrawer CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickdrawer CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickdrawer CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickdrawer CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickheaderview/CMakeLists.txt b/tests/auto/qquickheaderview/CMakeLists.txt index fe604d5c..dfcaa452 100644 --- a/tests/auto/qquickheaderview/CMakeLists.txt +++ b/tests/auto/qquickheaderview/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickheaderview +qt_internal_add_test(tst_qquickheaderview SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -38,12 +38,12 @@ qt_add_test(tst_qquickheaderview ## Scopes: ##################################################################### -qt_extend_target(tst_qquickheaderview CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickheaderview CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickheaderview CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickheaderview CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickiconimage/CMakeLists.txt b/tests/auto/qquickiconimage/CMakeLists.txt index 2ee0d295..fdad6ef9 100644 --- a/tests/auto/qquickiconimage/CMakeLists.txt +++ b/tests/auto/qquickiconimage/CMakeLists.txt @@ -14,7 +14,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/icons/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickiconimage +qt_internal_add_test(tst_qquickiconimage SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -57,7 +57,7 @@ set(resources_resource_files "icons/testtheme/index.theme" ) -qt_add_resource(tst_qquickiconimage "resources" +qt_internal_add_resource(tst_qquickiconimage "resources" PREFIX "/" FILES @@ -68,17 +68,17 @@ qt_add_resource(tst_qquickiconimage "resources" ## Scopes: ##################################################################### -qt_extend_target(tst_qquickiconimage CONDITION TARGET Qt::Svg +qt_internal_extend_target(tst_qquickiconimage CONDITION TARGET Qt::Svg PUBLIC_LIBRARIES Qt::Svg ) -qt_extend_target(tst_qquickiconimage CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickiconimage CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickiconimage CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickiconimage CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickiconlabel/CMakeLists.txt b/tests/auto/qquickiconlabel/CMakeLists.txt index 97e115a5..ffa084f7 100644 --- a/tests/auto/qquickiconlabel/CMakeLists.txt +++ b/tests/auto/qquickiconlabel/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}) -qt_add_test(tst_qquickiconlabel +qt_internal_add_test(tst_qquickiconlabel SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -39,12 +39,12 @@ qt_add_test(tst_qquickiconlabel ## Scopes: ##################################################################### -qt_extend_target(tst_qquickiconlabel CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickiconlabel CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickiconlabel CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickiconlabel CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickimaginestyle/CMakeLists.txt b/tests/auto/qquickimaginestyle/CMakeLists.txt index 7a3ffe08..568c4441 100644 --- a/tests/auto/qquickimaginestyle/CMakeLists.txt +++ b/tests/auto/qquickimaginestyle/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/tst_*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickimaginestyle +qt_internal_add_test(tst_qquickimaginestyle GUI QMLTEST SOURCES @@ -28,7 +28,7 @@ set(qmake_immediate_resource_files "test-assets/button-background-2.png" ) -qt_add_resource(tst_qquickimaginestyle "qmake_immediate" +qt_internal_add_resource(tst_qquickimaginestyle "qmake_immediate" PREFIX "/" FILES diff --git a/tests/auto/qquickmaterialstyle/CMakeLists.txt b/tests/auto/qquickmaterialstyle/CMakeLists.txt index 2b213448..332f376d 100644 --- a/tests/auto/qquickmaterialstyle/CMakeLists.txt +++ b/tests/auto/qquickmaterialstyle/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/tst_*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickmaterialstyle +qt_internal_add_test(tst_qquickmaterialstyle GUI QMLTEST SOURCES @@ -26,7 +26,7 @@ set(qmake_immediate_resource_files "qtquickcontrols2.conf" ) -qt_add_resource(tst_qquickmaterialstyle "qmake_immediate" +qt_internal_add_resource(tst_qquickmaterialstyle "qmake_immediate" PREFIX "/" FILES diff --git a/tests/auto/qquickmaterialstyleconf/CMakeLists.txt b/tests/auto/qquickmaterialstyleconf/CMakeLists.txt index fa0dde32..1244961a 100644 --- a/tests/auto/qquickmaterialstyleconf/CMakeLists.txt +++ b/tests/auto/qquickmaterialstyleconf/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickmaterialstyleconf +qt_internal_add_test(tst_qquickmaterialstyleconf SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -38,7 +38,7 @@ set(qquickmaterialstyleconf_resource_files "variant-normal.conf" ) -qt_add_resource(tst_qquickmaterialstyleconf "qquickmaterialstyleconf" +qt_internal_add_resource(tst_qquickmaterialstyleconf "qquickmaterialstyleconf" PREFIX "/" FILES @@ -52,12 +52,12 @@ qt_add_resource(tst_qquickmaterialstyleconf "qquickmaterialstyleconf" ## Scopes: ##################################################################### -qt_extend_target(tst_qquickmaterialstyleconf CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickmaterialstyleconf CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickmaterialstyleconf CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickmaterialstyleconf CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickmenu/CMakeLists.txt b/tests/auto/qquickmenu/CMakeLists.txt index 5d6b9ffa..702c5747 100644 --- a/tests/auto/qquickmenu/CMakeLists.txt +++ b/tests/auto/qquickmenu/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickmenu +qt_internal_add_test(tst_qquickmenu SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -37,12 +37,12 @@ qt_add_test(tst_qquickmenu ## Scopes: ##################################################################### -qt_extend_target(tst_qquickmenu CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickmenu CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickmenu CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickmenu CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickmenubar/CMakeLists.txt b/tests/auto/qquickmenubar/CMakeLists.txt index 72660ceb..c6043f87 100644 --- a/tests/auto/qquickmenubar/CMakeLists.txt +++ b/tests/auto/qquickmenubar/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickmenubar +qt_internal_add_test(tst_qquickmenubar SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -37,12 +37,12 @@ qt_add_test(tst_qquickmenubar ## Scopes: ##################################################################### -qt_extend_target(tst_qquickmenubar CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickmenubar CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickmenubar CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickmenubar CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickninepatchimage/CMakeLists.txt b/tests/auto/qquickninepatchimage/CMakeLists.txt index 4372cbce..83cf364b 100644 --- a/tests/auto/qquickninepatchimage/CMakeLists.txt +++ b/tests/auto/qquickninepatchimage/CMakeLists.txt @@ -14,7 +14,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/*.png) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickninepatchimage +qt_internal_add_test(tst_qquickninepatchimage SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -44,12 +44,12 @@ qt_add_test(tst_qquickninepatchimage ## Scopes: ##################################################################### -qt_extend_target(tst_qquickninepatchimage CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickninepatchimage CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickninepatchimage CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickninepatchimage CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickpopup/CMakeLists.txt b/tests/auto/qquickpopup/CMakeLists.txt index 43d6d778..9b736f80 100644 --- a/tests/auto/qquickpopup/CMakeLists.txt +++ b/tests/auto/qquickpopup/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickpopup +qt_internal_add_test(tst_qquickpopup SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -37,12 +37,12 @@ qt_add_test(tst_qquickpopup ## Scopes: ##################################################################### -qt_extend_target(tst_qquickpopup CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickpopup CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickpopup CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickpopup CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickstyle/CMakeLists.txt b/tests/auto/qquickstyle/CMakeLists.txt index 71e58cca..153cf19e 100644 --- a/tests/auto/qquickstyle/CMakeLists.txt +++ b/tests/auto/qquickstyle/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickstyle +qt_internal_add_test(tst_qquickstyle SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -41,7 +41,7 @@ set(qmake_custom_resource_files "data/Custom/qmldir" ) -qt_add_resource(tst_qquickstyle "qmake_custom" +qt_internal_add_resource(tst_qquickstyle "qmake_custom" PREFIX "/" FILES @@ -55,12 +55,12 @@ qt_add_resource(tst_qquickstyle "qmake_custom" ## Scopes: ##################################################################### -qt_extend_target(tst_qquickstyle CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickstyle CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickstyle CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickstyle CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickuniversalstyle/CMakeLists.txt b/tests/auto/qquickuniversalstyle/CMakeLists.txt index 99816bef..43d4c10d 100644 --- a/tests/auto/qquickuniversalstyle/CMakeLists.txt +++ b/tests/auto/qquickuniversalstyle/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/tst_*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickuniversalstyle +qt_internal_add_test(tst_qquickuniversalstyle GUI QMLTEST SOURCES @@ -25,7 +25,7 @@ set(qmake_immediate_resource_files "qtquickcontrols2.conf" ) -qt_add_resource(tst_qquickuniversalstyle "qmake_immediate" +qt_internal_add_resource(tst_qquickuniversalstyle "qmake_immediate" PREFIX "/" FILES diff --git a/tests/auto/qquickuniversalstyleconf/CMakeLists.txt b/tests/auto/qquickuniversalstyleconf/CMakeLists.txt index 1125e75b..ab754043 100644 --- a/tests/auto/qquickuniversalstyleconf/CMakeLists.txt +++ b/tests/auto/qquickuniversalstyleconf/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qquickuniversalstyleconf +qt_internal_add_test(tst_qquickuniversalstyleconf SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -36,7 +36,7 @@ set(qquickuniversalstyleconf_resource_files "qtquickcontrols2.conf" ) -qt_add_resource(tst_qquickuniversalstyleconf "qquickuniversalstyleconf" +qt_internal_add_resource(tst_qquickuniversalstyleconf "qquickuniversalstyleconf" PREFIX "/" FILES @@ -50,12 +50,12 @@ qt_add_resource(tst_qquickuniversalstyleconf "qquickuniversalstyleconf" ## Scopes: ##################################################################### -qt_extend_target(tst_qquickuniversalstyleconf CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qquickuniversalstyleconf CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickuniversalstyleconf CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qquickuniversalstyleconf CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/revisions/CMakeLists.txt b/tests/auto/revisions/CMakeLists.txt index fbed2b6a..79a0f8e3 100644 --- a/tests/auto/revisions/CMakeLists.txt +++ b/tests/auto/revisions/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_revisions Test: ##################################################################### -qt_add_test(tst_revisions +qt_internal_add_test(tst_revisions SOURCES tst_revisions.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/sanity/CMakeLists.txt b/tests/auto/sanity/CMakeLists.txt index fb2f2014..63a8eeb7 100644 --- a/tests/auto/sanity/CMakeLists.txt +++ b/tests/auto/sanity/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_sanity Test: ##################################################################### -qt_add_test(tst_sanity +qt_internal_add_test(tst_sanity SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -32,12 +32,12 @@ qt_add_test(tst_sanity ## Scopes: ##################################################################### -qt_extend_target(tst_sanity CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_sanity CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_sanity CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_sanity CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/snippets/CMakeLists.txt b/tests/auto/snippets/CMakeLists.txt index 6a9bbc5f..cecbbc79 100644 --- a/tests/auto/snippets/CMakeLists.txt +++ b/tests/auto/snippets/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob ${CMAKE_CURRENT_SOURCE_DIR}/data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_snippets +qt_internal_add_test(tst_snippets SOURCES tst_snippets.cpp DEFINES @@ -28,7 +28,7 @@ set(qmake_immediate_resource_files "qtquickcontrols2.conf" ) -qt_add_resource(tst_snippets "qmake_immediate" +qt_internal_add_resource(tst_snippets "qmake_immediate" PREFIX "/" FILES diff --git a/tests/auto/styleimports/.prev_CMakeLists.txt b/tests/auto/styleimports/.prev_CMakeLists.txt index 108a2054..4d614767 100644 --- a/tests/auto/styleimports/.prev_CMakeLists.txt +++ b/tests/auto/styleimports/.prev_CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_styleimports +qt_internal_add_test(tst_styleimports SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -38,7 +38,7 @@ set(qmake_resourcestyle_resource_files "resources/ResourceStyle/qmldir" ) -qt_add_resource(tst_styleimports "qmake_resourcestyle" +qt_internal_add_resource(tst_styleimports "qmake_resourcestyle" PREFIX "/" BASE @@ -54,12 +54,12 @@ qt_add_resource(tst_styleimports "qmake_resourcestyle" ## Scopes: ##################################################################### -qt_extend_target(tst_styleimports CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_styleimports CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_styleimports CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_styleimports CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/styleimports/CMakeLists.txt b/tests/auto/styleimports/CMakeLists.txt index 27ba24e7..94e7bce8 100644 --- a/tests/auto/styleimports/CMakeLists.txt +++ b/tests/auto/styleimports/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_styleimports +qt_internal_add_test(tst_styleimports SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -38,7 +38,7 @@ set(qmake_resourcestyle_resource_files "ResourceStyle/qmldir" # special case ) -qt_add_resource(tst_styleimports "qmake_resourcestyle" +qt_internal_add_resource(tst_styleimports "qmake_resourcestyle" PREFIX "/" BASE @@ -54,12 +54,12 @@ qt_add_resource(tst_styleimports "qmake_resourcestyle" ## Scopes: ##################################################################### -qt_extend_target(tst_styleimports CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_styleimports CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_styleimports CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_styleimports CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/styleimportscompiletimematerial/CMakeLists.txt b/tests/auto/styleimportscompiletimematerial/CMakeLists.txt index af167d0c..9201503b 100644 --- a/tests/auto/styleimportscompiletimematerial/CMakeLists.txt +++ b/tests/auto/styleimportscompiletimematerial/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_styleimportscompiletimematerial +qt_internal_add_test(tst_styleimportscompiletimematerial SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -37,12 +37,12 @@ qt_add_test(tst_styleimportscompiletimematerial ## Scopes: ##################################################################### -qt_extend_target(tst_styleimportscompiletimematerial CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_styleimportscompiletimematerial CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_styleimportscompiletimematerial CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_styleimportscompiletimematerial CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/styleimportscompiletimeqmlonly/CMakeLists.txt b/tests/auto/styleimportscompiletimeqmlonly/CMakeLists.txt index 4a59c682..57fbc1d3 100644 --- a/tests/auto/styleimportscompiletimeqmlonly/CMakeLists.txt +++ b/tests/auto/styleimportscompiletimeqmlonly/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_styleimportscompiletimeqmlonly +qt_internal_add_test(tst_styleimportscompiletimeqmlonly SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -37,12 +37,12 @@ qt_add_test(tst_styleimportscompiletimeqmlonly ## Scopes: ##################################################################### -qt_extend_target(tst_styleimportscompiletimeqmlonly CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_styleimportscompiletimeqmlonly CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_styleimportscompiletimeqmlonly CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_styleimportscompiletimeqmlonly CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/translation/CMakeLists.txt b/tests/auto/translation/CMakeLists.txt index 5b9c576d..ec8e81ce 100644 --- a/tests/auto/translation/CMakeLists.txt +++ b/tests/auto/translation/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_translation +qt_internal_add_test(tst_translation SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -37,7 +37,7 @@ set(qmake_immediate_resource_files "qtbase_fr.qm" ) -qt_add_resource(tst_translation "qmake_immediate" +qt_internal_add_resource(tst_translation "qmake_immediate" PREFIX "/" FILES @@ -51,12 +51,12 @@ qt_add_resource(tst_translation "qmake_immediate" ## Scopes: ##################################################################### -qt_extend_target(tst_translation CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_translation CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_translation CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_translation CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/benchmarks/creationtime/CMakeLists.txt b/tests/benchmarks/creationtime/CMakeLists.txt index 7979a42f..f3c5ad07 100644 --- a/tests/benchmarks/creationtime/CMakeLists.txt +++ b/tests/benchmarks/creationtime/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_creationtime Test: ##################################################################### -qt_add_test(tst_creationtime +qt_internal_add_test(tst_creationtime SOURCES ../../auto/shared/qtest_quickcontrols.h ../../auto/shared/util.cpp ../../auto/shared/util.h @@ -31,12 +31,12 @@ qt_add_test(tst_creationtime ## Scopes: ##################################################################### -qt_extend_target(tst_creationtime CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_creationtime CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_creationtime CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_creationtime CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/benchmarks/objectcount/CMakeLists.txt b/tests/benchmarks/objectcount/CMakeLists.txt index 909fa988..932e18c6 100644 --- a/tests/benchmarks/objectcount/CMakeLists.txt +++ b/tests/benchmarks/objectcount/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_objectcount Test: ##################################################################### -qt_add_test(tst_objectcount +qt_internal_add_test(tst_objectcount SOURCES ../../auto/shared/qtest_quickcontrols.h ../../auto/shared/util.cpp ../../auto/shared/util.h @@ -31,12 +31,12 @@ qt_add_test(tst_objectcount ## Scopes: ##################################################################### -qt_extend_target(tst_objectcount CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_objectcount CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_objectcount CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_objectcount CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) -- cgit v1.2.3