diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-23 11:34:07 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-07 21:54:30 +0200 |
| commit | ed65d1ab49e6f5537b086178f9f9d14fc190b663 (patch) | |
| tree | dca778ac347fb25b11bd665e0818f8454c7be0b1 /src/imports/controls/fusion | |
| parent | 81e8cd67198768a08f5c65ec026e1553f78e1375 (diff) | |
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 <cristian.adam@qt.io>
Diffstat (limited to 'src/imports/controls/fusion')
| -rw-r--r-- | src/imports/controls/fusion/.prev_CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/imports/controls/fusion/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/imports/controls/fusion/impl/CMakeLists.txt | 2 |
3 files changed, 13 insertions, 6 deletions
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 |