Qt 6.2 QJSEngine meyatype converter

.cmake.conf

@@ -1 +1,2 @@
-set(QT_REPO_MODULE_VERSION "6.2.0")
+set(QT_REPO_MODULE_VERSION "6.2.11")
+set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "")

.gitattributes

@@ -1,4 +1,5 @@
-*_crlf.*        eol=crlf
-.tag            export-subst
-.gitignore      export-ignore
-.gitattributes  export-ignore
+*_crlf.*         eol=crlf
+.tag             export-subst
+.gitignore       export-ignore
+.gitattributes   export-ignore
+.commit-template export-ignore

.gitignore

@@ -85,12 +85,32 @@ bin/qml*
 bin/qttracereplay*
 configure.cache
 config.status
+examples/quickcontrols2/chattutorial/chapter1-settingup/chapter1-settingup
+examples/quickcontrols2/chattutorial/chapter2-lists/chapter2-lists
+examples/quickcontrols2/chattutorial/chapter3-navigation/chapter3-navigation
+examples/quickcontrols2/chattutorial/chapter4-models/chapter4-models
+examples/quickcontrols2/chattutorial/chapter5-styling/chapter5-styling
+examples/quickcontrols2/contactlist/contactlist
+examples/quickcontrols2/flatstyle/flatstyle
+examples/quickcontrols2/gallery/gallery
+examples/quickcontrols2/imagine/automotive/automotive
+examples/quickcontrols2/imagine/musicplayer/musicplayer
+examples/quickcontrols2/sidepanel/sidepanel
+examples/quickcontrols2/swipetoremove/swipetoremove
+examples/quickcontrols2/texteditor/texteditor
+examples/quickcontrols2/wearable/wearable
 moc_*.cpp
 qmake/qmake.exe
 qmake/Makefile.bak
 src/corelib/global/qconfig.cpp
 src/corelib/global/qconfig.h
 src/corelib/global/qconfig.h.qmake
+src/quickcontrols2/qtquickcontrols2-config.h
+src/quickcontrols2/qtquickcontrols2-config.pri
+src/quickcontrols2/qtquickcontrols2-config_p.h
+src/quicktemplates2/qtquicktemplates2-config.h
+src/quicktemplates2/qtquicktemplates2-config.pri
+src/quicktemplates2/qtquicktemplates2-config_p.h
 ui_*.h
 tests/auto/cmake/build
 tests/auto/installed_cmake/build
@@ -107,6 +127,50 @@ tests/auto/qprocess/fileWriterProcess.txt
 .com.apple.timemachine.supported
 tests/auto/qlibrary/libmylib.so*
 tests/auto/qresourceengine/runtime_resource.rcc
+tests/auto/quickcontrols2/accessibility/tst_accessibility
+tests/auto/quickcontrols2/calendar/tst_calendar
+tests/auto/quickcontrols2/controls/basic/tst_basic
+tests/auto/quickcontrols2/controls/fusion/tst_fusion
+tests/auto/quickcontrols2/controls/imagine/tst_imagine
+tests/auto/quickcontrols2/controls/material/tst_material
+tests/auto/quickcontrols2/controls/universal/tst_universal
+tests/auto/quickcontrols2/cursor/tst_cursor
+tests/auto/quickcontrols2/customization/tst_customization
+tests/auto/quickcontrols2/focus/tst_focus
+tests/auto/quickcontrols2/font/tst_font
+tests/auto/quickcontrols2/palette/tst_palette
+tests/auto/quickcontrols2/platform/tst_platform
+tests/auto/quickcontrols2/pressandhold/tst_pressandhold
+tests/auto/quickcontrols2/qquickapplicationwindow/tst_qquickapplicationwindow
+tests/auto/quickcontrols2/qquickcolor/tst_qquickcolor
+tests/auto/quickcontrols2/qquickdrawer/tst_qquickdrawer
+tests/auto/quickcontrols2/qquickiconimage/tst_qquickiconimage
+tests/auto/quickcontrols2/qquickiconlabel/tst_qquickiconlabel
+tests/auto/quickcontrols2/qquickimaginestyle/tst_qquickimaginestyle
+tests/auto/quickcontrols2/qquickmaterialstyle/tst_qquickmaterialstyle
+tests/auto/quickcontrols2/qquickmaterialstyleconf/tst_qquickmaterialstyleconf
+tests/auto/quickcontrols2/qquickmenu/tst_qquickmenu
+tests/auto/quickcontrols2/qquickmenubar/tst_qquickmenubar
+tests/auto/quickcontrols2/qquickninepatchimage/tst_qquickninepatchimage
+tests/auto/quickcontrols2/qquickpopup/tst_qquickpopup
+tests/auto/quickcontrols2/qquickstyle/tst_qquickstyle
+tests/auto/quickcontrols2/qquickstyleselector/tst_qquickstyleselector
+tests/auto/quickcontrols2/qquickuniversalstyle/tst_qquickuniversalstyle
+tests/auto/quickcontrols2/qquickuniversalstyleconf/tst_qquickuniversalstyleconf
+tests/auto/quickcontrols2/revisions/tst_revisions
+tests/auto/quickcontrols2/sanity/tst_sanity
+tests/auto/quickcontrols2/snippets/tst_snippets
+tests/auto/quickcontrols2/styles/tst_styles
+tests/auto/quickcontrols2/snippets/screenshots/*.png
+tests/benchmarks/creationtime/tst_creationtime
+tests/benchmarks/objectcount/tst_objectcount
+tests/manual/quickcontrols2/buttons/buttons
+tests/manual/quickcontrols2/fonts/fonts
+tests/manual/quickcontrols2/gifs/tst_gifs
+tests/manual/quickcontrols2/styles/styles
+tests/manual/quickcontrols2/testbench/testbench
+tests/manual/quickcontrols2/screenshots/screenshots
+tests/manual/quickcontrols2/gifs/gifs/*.gif
 tools/qtestlib/chart/chart*
 tools/qtestlib/updater/updater*
 tools/qmleasing/qmleasing

.qmake.conf

@@ -3,4 +3,6 @@ CONFIG += warning_clean
 
 DEFINES += QT_NO_JAVA_STYLE_ITERATORS
 
-MODULE_VERSION = 6.2.0
+QQC2_SOURCE_TREE = $$PWD
+
+MODULE_VERSION = 6.2.11

.tag

@@ -1 +1 @@
-$Format:%H$
+$Format:%T$

CMakeLists.txt

@@ -1,6 +1,6 @@
 # Generated from qtdeclarative.pro.
 
-cmake_minimum_required(VERSION 3.15.0)
+cmake_minimum_required(VERSION 3.16)
 
 include(.cmake.conf)
 project(QtDeclarative # special case
@@ -39,9 +39,17 @@ if(NOT "${QT_HOST_PATH}" STREQUAL "")
      set(CMAKE_FIND_ROOT_PATH ${_qt_backup_qtdeclarative_CMAKE_FIND_ROOT_PATH})
 endif()
 
+# Optionally look for the target ShaderTools package to avoid warnings
+# when configuring the project to build examples in-tree in a prefix Qt build.
+# See QTBUG-96358 for details.
+find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS ShaderTools)
+
 # special case begin
 # export QT6_ADD_QML_MODULE to this project
 include(src/qml/Qt6QmlMacros.cmake)
+if(ANDROID)
+    include("${CMAKE_CURRENT_LIST_DIR}/src/qml/Qt6AndroidQmlMacros.cmake")
+endif()
 # special case end
 
 if(NOT QT_FEATURE_commandlineparser)