aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/imagine/.prev_CMakeLists.txt
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2020-05-11 16:33:45 +0200
committerLaszlo Agocs <laszlo.agocs@qt.io>2020-05-12 14:55:05 +0200
commit5b376af5065bf756a1a08f33a551cc187d4de937 (patch)
treeba5c26034268f70354b108e38a3b23e0d55be9db /src/imports/controls/imagine/.prev_CMakeLists.txt
parent3adeceaa1cfe5fae55ca6bd75226c52363a7e7d3 (diff)
Switch to a built-in OpacityMask effect for Imagine style
No point in pulling in Graphical Effects just for this. Instead, follow what we did for RectangularGlow in the Material style. Task-number: QTBUG-78631 Change-Id: Ibe5f9c18ea4dbdca78ac24facbd5786deebb716f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/imagine/.prev_CMakeLists.txt')
-rw-r--r--src/imports/controls/imagine/.prev_CMakeLists.txt158
1 files changed, 155 insertions, 3 deletions
diff --git a/src/imports/controls/imagine/.prev_CMakeLists.txt b/src/imports/controls/imagine/.prev_CMakeLists.txt
index 5deb1489..5533f872 100644
--- a/src/imports/controls/imagine/.prev_CMakeLists.txt
+++ b/src/imports/controls/imagine/.prev_CMakeLists.txt
@@ -4,14 +4,13 @@
## qtquickcontrols2imaginestyleplugin Plugin:
#####################################################################
-add_qml_module(qtquickcontrols2imaginestyleplugin
+qt_add_qml_module(qtquickcontrols2imaginestyleplugin
TARGET_PATH "QtQuick/Controls.2/Imagine"
URI "QtQuick.Controls.Imagine"
VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
CLASSNAME QtQuickControls2ImagineStylePlugin
DEPENDENCIES
QtQuick.Controls/2.5
- QtGraphicalEffects/1.0
SKIP_TYPE_REGISTRATION
SOURCES
qquickimageselector.cpp qquickimageselector_p.h
@@ -50,9 +49,12 @@ endforeach()
set(qmake_qtquickcontrols2imaginestyle_resource_files
${resource_glob_0}
${resource_glob_1}
+ "shaders/+glslcore/OpacityMask.frag"
+ "shaders/+qsb/OpacityMask.frag"
+ "shaders/OpacityMask.frag"
)
-add_qt_resource(qtquickcontrols2imaginestyleplugin "qmake_qtquickcontrols2imaginestyle"
+qt_add_resource(qtquickcontrols2imaginestyleplugin "qmake_qtquickcontrols2imaginestyle"
PREFIX
"qt-project.org/imports/QtQuick/Controls.2/Imagine"
FILES
@@ -81,11 +83,13 @@ set(qml_files
"Drawer.qml"
"Frame.qml"
"GroupBox.qml"
+ "HorizontalHeaderView.qml"
"ItemDelegate.qml"
"Label.qml"
"Menu.qml"
"MenuItem.qml"
"MenuSeparator.qml"
+ "OpacityMask.qml"
"PageIndicator.qml"
"Page.qml"
"Pane.qml"
@@ -114,6 +118,154 @@ set(qml_files
"ToolSeparator.qml"
"ToolTip.qml"
"Tumbler.qml"
+ "VerticalHeaderView.qml"
+)
+set_source_files_properties(ApplicationWindow.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(BusyIndicator.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(Button.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(CheckBox.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(CheckDelegate.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(ComboBox.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(DelayButton.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(Dial.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(Dialog.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(DialogButtonBox.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(Drawer.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(Frame.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(GroupBox.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(HorizontalHeaderView.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(ItemDelegate.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(Label.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(Menu.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(MenuItem.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(MenuSeparator.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(OpacityMask.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(PageIndicator.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(Page.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(Pane.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(Popup.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(ProgressBar.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(RadioButton.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(RadioDelegate.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(RangeSlider.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(RoundButton.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(ScrollBar.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(ScrollIndicator.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(Slider.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(SpinBox.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(SplitView.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(StackView.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(SwipeDelegate.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(SwipeView.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(Switch.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(SwitchDelegate.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(TextField.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(TextArea.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(TabBar.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(TabButton.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(ToolBar.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(ToolButton.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(ToolSeparator.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(ToolTip.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(Tumbler.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
+)
+set_source_files_properties(VerticalHeaderView.qml PROPERTIES
+ QT_QML_SKIP_QMLDIR_ENTRY TRUE
)
qt6_target_qml_files(qtquickcontrols2imaginestyleplugin