diff options
Diffstat (limited to 'src/imports')
27 files changed, 97 insertions, 54 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 |