aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/imagine/.prev_CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports/controls/imagine/.prev_CMakeLists.txt')
-rw-r--r--src/imports/controls/imagine/.prev_CMakeLists.txt119
1 files changed, 55 insertions, 64 deletions
diff --git a/src/imports/controls/imagine/.prev_CMakeLists.txt b/src/imports/controls/imagine/.prev_CMakeLists.txt
index a7c0a59e..b1e1a959 100644
--- a/src/imports/controls/imagine/.prev_CMakeLists.txt
+++ b/src/imports/controls/imagine/.prev_CMakeLists.txt
@@ -5,18 +5,15 @@
#####################################################################
qt_add_qml_module(qtquickcontrols2imaginestyleplugin
- TARGET_PATH "QtQuick/Controls/Imagine"
URI "QtQuick.Controls.Imagine"
- VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
+ VERSION "${CMAKE_PROJECT_VERSION}"
CLASSNAME QtQuickControls2ImagineStylePlugin
- DEPENDENCIES
- QtQuick.Controls/2.5
- SKIP_TYPE_REGISTRATION
+ IMPORTS
+ QtQuick.Controls.Default/auto
+ GENERATE_QMLTYPES
SOURCES
- qquickimageselector.cpp qquickimageselector_p.h
qquickimaginestyle.cpp qquickimaginestyle_p.h
qquickimaginetheme.cpp qquickimaginetheme_p.h
- qquickninepatchimage.cpp qquickninepatchimage_p.h
qtquickcontrols2imaginestyleplugin.cpp
DEFINES
QT_NO_CAST_FROM_ASCII
@@ -25,6 +22,7 @@ qt_add_qml_module(qtquickcontrols2imaginestyleplugin
Qt::CorePrivate
Qt::GuiPrivate
Qt::QmlPrivate
+ Qt::QuickControls2ImplPrivate
Qt::QuickControls2Private
Qt::QuickPrivate
Qt::QuickTemplates2Private
@@ -49,9 +47,6 @@ endforeach()
set(qmake_qtquickcontrols2imaginestyle_resource_files
${resource_glob_0}
${resource_glob_1}
- "shaders/+glslcore/OpacityMask.frag"
- "shaders/+qsb/OpacityMask.frag"
- "shaders/OpacityMask.frag"
)
qt_add_resource(qtquickcontrols2imaginestyleplugin "qmake_qtquickcontrols2imaginestyle"
@@ -63,9 +58,9 @@ qt_add_resource(qtquickcontrols2imaginestyleplugin "qmake_qtquickcontrols2imagin
#### Keys ignored in scope 1:.:.:imagine.pro:<TRUE>:
-# IMPORT_NAME = "QtQuick.Controls.Imagine"
-# IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
# OTHER_FILES = "qmldir" "$$QML_FILES"
+# QML_IMPORT_NAME = "QtQuick.Controls.Imagine"
+# QML_IMPORT_VERSION = "$$QT_VERSION"
# TARGETPATH = "QtQuick/Controls/Imagine"
# _REQUIREMENTS = "qtConfig(quickcontrols2-imagine)"
@@ -89,7 +84,6 @@ set(qml_files
"Menu.qml"
"MenuItem.qml"
"MenuSeparator.qml"
- "OpacityMask.qml"
"PageIndicator.qml"
"Page.qml"
"Pane.qml"
@@ -121,151 +115,148 @@ set(qml_files
"VerticalHeaderView.qml"
)
set_source_files_properties(ApplicationWindow.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(BusyIndicator.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(Button.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(CheckBox.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(CheckDelegate.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(ComboBox.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(DelayButton.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.2;6.0"
)
set_source_files_properties(Dial.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(Dialog.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.1;6.0"
)
set_source_files_properties(DialogButtonBox.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.1;6.0"
)
set_source_files_properties(Drawer.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(Frame.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(GroupBox.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(HorizontalHeaderView.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.15;6.0"
)
set_source_files_properties(ItemDelegate.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(Label.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(Menu.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(MenuItem.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
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
+ QT_QML_SOURCE_VERSION "2.1;6.0"
)
set_source_files_properties(PageIndicator.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(Page.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(Pane.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(Popup.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(ProgressBar.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(RadioButton.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(RadioDelegate.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(RangeSlider.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(RoundButton.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.1;6.0"
)
set_source_files_properties(ScrollBar.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(ScrollIndicator.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(Slider.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(SpinBox.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(SplitView.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.13;6.0"
)
set_source_files_properties(StackView.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(SwipeDelegate.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(SwipeView.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(Switch.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(SwitchDelegate.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(TextField.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(TextArea.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(TabBar.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(TabButton.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(ToolBar.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(ToolButton.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(ToolSeparator.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.1;6.0"
)
set_source_files_properties(ToolTip.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(Tumbler.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.0;6.0"
)
set_source_files_properties(VerticalHeaderView.qml PROPERTIES
- QT_QML_SKIP_QMLDIR_ENTRY TRUE
+ QT_QML_SOURCE_VERSION "2.15;6.0"
)
qt6_target_qml_files(qtquickcontrols2imaginestyleplugin