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/material/CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/imports/controls/material/CMakeLists.txt') 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" ) -- cgit v1.2.3