aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2020-10-28 16:02:11 +0100
committerMitch Curtis <mitch.curtis@qt.io>2020-10-28 16:18:36 +0100
commitb5c902d51438c8e1fae77d5c04b14e88cc687703 (patch)
tree4c4b1c8aa0d6760a3a3002cd124909d236c361a3 /src
parent3a545797ee94562f776bb62cd086d45dd7420149 (diff)
Regenerate CMake project files
Change-Id: I7f1fe2b07a6c22f02802b0fdc31917b398cbd770 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/imports/controls/basic/impl/CMakeLists.txt1
-rw-r--r--src/imports/controls/fusion/impl/CMakeLists.txt1
-rw-r--r--src/imports/controls/imagine/impl/CMakeLists.txt1
-rw-r--r--src/imports/controls/macos/.prev_CMakeLists.txt1
-rw-r--r--src/imports/controls/macos/CMakeLists.txt1
-rw-r--r--src/imports/controls/material/impl/CMakeLists.txt1
-rw-r--r--src/imports/controls/universal/impl/CMakeLists.txt1
-rw-r--r--src/imports/controls/windows/.prev_CMakeLists.txt5
-rw-r--r--src/imports/controls/windows/CMakeLists.txt4
9 files changed, 16 insertions, 0 deletions
diff --git a/src/imports/controls/basic/impl/CMakeLists.txt b/src/imports/controls/basic/impl/CMakeLists.txt
index 27c56e7f..2e60dcf1 100644
--- a/src/imports/controls/basic/impl/CMakeLists.txt
+++ b/src/imports/controls/basic/impl/CMakeLists.txt
@@ -10,6 +10,7 @@ qt_internal_add_qml_module(qtquickcontrols2basicstyleimplplugin
CLASSNAME QtQuickControls2BasicStyleImplPlugin
SKIP_TYPE_REGISTRATION
GENERATE_QMLTYPES
+ INSTALL_QMLTYPES
SOURCES
qquickbasicbusyindicator.cpp qquickbasicbusyindicator_p.h
qquickbasicdial.cpp qquickbasicdial_p.h
diff --git a/src/imports/controls/fusion/impl/CMakeLists.txt b/src/imports/controls/fusion/impl/CMakeLists.txt
index 84622df4..af5900bc 100644
--- a/src/imports/controls/fusion/impl/CMakeLists.txt
+++ b/src/imports/controls/fusion/impl/CMakeLists.txt
@@ -9,6 +9,7 @@ qt_internal_add_qml_module(qtquickcontrols2fusionstyleimplplugin
VERSION "${CMAKE_PROJECT_VERSION}"
CLASSNAME QtQuickControls2FusionStyleImplPlugin
GENERATE_QMLTYPES
+ INSTALL_QMLTYPES
SOURCES
qquickfusionbusyindicator.cpp qquickfusionbusyindicator_p.h
qquickfusiondial.cpp qquickfusiondial_p.h
diff --git a/src/imports/controls/imagine/impl/CMakeLists.txt b/src/imports/controls/imagine/impl/CMakeLists.txt
index 5e02b5e3..3ddec611 100644
--- a/src/imports/controls/imagine/impl/CMakeLists.txt
+++ b/src/imports/controls/imagine/impl/CMakeLists.txt
@@ -9,6 +9,7 @@ qt_internal_add_qml_module(qtquickcontrols2imaginestyleimplplugin
VERSION "${CMAKE_PROJECT_VERSION}"
CLASSNAME QtQuickControls2ImagineStyleImplPlugin
GENERATE_QMLTYPES
+ INSTALL_QMLTYPES
SOURCES
qquickimageselector.cpp qquickimageselector_p.h
qquickninepatchimage.cpp qquickninepatchimage_p.h
diff --git a/src/imports/controls/macos/.prev_CMakeLists.txt b/src/imports/controls/macos/.prev_CMakeLists.txt
index 53584ac4..97b29823 100644
--- a/src/imports/controls/macos/.prev_CMakeLists.txt
+++ b/src/imports/controls/macos/.prev_CMakeLists.txt
@@ -11,6 +11,7 @@ qt_internal_add_qml_module(qtquickcontrols2macosstyleplugin
IMPORTS
QtQuick.Controls.Fusion/auto
GENERATE_QMLTYPES
+ INSTALL_QMLTYPES
SOURCES
qtquickcontrols2macosstyleplugin.cpp
DEFINES
diff --git a/src/imports/controls/macos/CMakeLists.txt b/src/imports/controls/macos/CMakeLists.txt
index ca335f34..f00f7c5c 100644
--- a/src/imports/controls/macos/CMakeLists.txt
+++ b/src/imports/controls/macos/CMakeLists.txt
@@ -11,6 +11,7 @@ qt_internal_add_qml_module(qtquickcontrols2macosstyleplugin
IMPORTS
QtQuick.Controls.Fusion/auto
GENERATE_QMLTYPES
+ INSTALL_QMLTYPES
SOURCES
qtquickcontrols2macosstyleplugin.cpp
DEFINES
diff --git a/src/imports/controls/material/impl/CMakeLists.txt b/src/imports/controls/material/impl/CMakeLists.txt
index 1f47650c..b9558d79 100644
--- a/src/imports/controls/material/impl/CMakeLists.txt
+++ b/src/imports/controls/material/impl/CMakeLists.txt
@@ -9,6 +9,7 @@ qt_internal_add_qml_module(qtquickcontrols2materialstyleimplplugin
VERSION "${CMAKE_PROJECT_VERSION}"
CLASSNAME QtQuickControls2MaterialStyleImplPlugin
GENERATE_QMLTYPES
+ INSTALL_QMLTYPES
SOURCES
qquickmaterialbusyindicator.cpp qquickmaterialbusyindicator_p.h
qquickmaterialprogressbar.cpp qquickmaterialprogressbar_p.h
diff --git a/src/imports/controls/universal/impl/CMakeLists.txt b/src/imports/controls/universal/impl/CMakeLists.txt
index 72572fab..793d9e24 100644
--- a/src/imports/controls/universal/impl/CMakeLists.txt
+++ b/src/imports/controls/universal/impl/CMakeLists.txt
@@ -9,6 +9,7 @@ qt_internal_add_qml_module(qtquickcontrols2universalstyleimplplugin
VERSION "${CMAKE_PROJECT_VERSION}"
CLASSNAME QtQuickControls2UniversalStyleImplPlugin
GENERATE_QMLTYPES
+ INSTALL_QMLTYPES
SOURCES
qquickuniversalbusyindicator.cpp qquickuniversalbusyindicator_p.h
qquickuniversalfocusrectangle.cpp qquickuniversalfocusrectangle_p.h
diff --git a/src/imports/controls/windows/.prev_CMakeLists.txt b/src/imports/controls/windows/.prev_CMakeLists.txt
index cd34864d..64e54338 100644
--- a/src/imports/controls/windows/.prev_CMakeLists.txt
+++ b/src/imports/controls/windows/.prev_CMakeLists.txt
@@ -11,6 +11,7 @@ qt_internal_add_qml_module(qtquickcontrols2windowsstyleplugin
IMPORTS
QtQuick.Controls.Fusion/auto
GENERATE_QMLTYPES
+ INSTALL_QMLTYPES
SOURCES
qtquickcontrols2windowsstyleplugin.cpp
DEFINES
@@ -51,6 +52,7 @@ set(qml_files
"SpinBox.qml"
"TextArea.qml"
"TextField.qml"
+ "ScrollBar.qml"
"ScrollView.qml"
)
set_source_files_properties(Button.qml PROPERTIES
@@ -86,6 +88,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(ScrollBar.qml PROPERTIES
+ QT_QML_SOURCE_VERSION "6.0"
+)
set_source_files_properties(ScrollView.qml PROPERTIES
QT_QML_SOURCE_VERSION "6.0"
)
diff --git a/src/imports/controls/windows/CMakeLists.txt b/src/imports/controls/windows/CMakeLists.txt
index edd144bb..2ccc3e9e 100644
--- a/src/imports/controls/windows/CMakeLists.txt
+++ b/src/imports/controls/windows/CMakeLists.txt
@@ -11,6 +11,7 @@ qt_internal_add_qml_module(qtquickcontrols2windowsstyleplugin
IMPORTS
QtQuick.Controls.Fusion/auto
GENERATE_QMLTYPES
+ INSTALL_QMLTYPES
SOURCES
qtquickcontrols2windowsstyleplugin.cpp
DEFINES
@@ -87,6 +88,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(ScrollBar.qml PROPERTIES
+ QT_QML_SOURCE_VERSION "6.0"
+)
set_source_files_properties(ScrollView.qml PROPERTIES
QT_QML_SOURCE_VERSION "6.0"
)