Calls order of q_invokable method

.cmake.conf

@@ -1 +1,7 @@
-set(QT_REPO_MODULE_VERSION "6.2.0")
+set(QT_REPO_MODULE_VERSION "6.9.0")
+set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
+
+set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_LEAN_HEADERS=1")
+list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1")
+list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1")
+list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_QSNPRINTF=1")

.gitattributes

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

.gitignore

@@ -85,12 +85,31 @@ bin/qml*
 bin/qttracereplay*
 configure.cache
 config.status
+examples/quickcontrols/chattutorial/chapter1-settingup/chapter1-settingup
+examples/quickcontrols/chattutorial/chapter2-lists/chapter2-lists
+examples/quickcontrols/chattutorial/chapter3-navigation/chapter3-navigation
+examples/quickcontrols/chattutorial/chapter4-models/chapter4-models
+examples/quickcontrols/chattutorial/chapter5-styling/chapter5-styling
+examples/quickcontrols/contactlist/contactlist
+examples/quickcontrols/flatstyle/flatstyle
+examples/quickcontrols/gallery/gallery
+examples/quickcontrols/imagine/automotive/automotive
+examples/quickcontrols/sidepanel/sidepanel
+examples/quickcontrols/swipetoremove/swipetoremove
+examples/quickcontrols/texteditor/texteditor
+examples/quickcontrols/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/quickcontrols/qtquickcontrols2-config.h
+src/quickcontrols/qtquickcontrols2-config.pri
+src/quickcontrols/qtquickcontrols2-config_p.h
+src/quicktemplates/qtquicktemplates2-config.h
+src/quicktemplates/qtquicktemplates2-config.pri
+src/quicktemplates/qtquicktemplates2-config_p.h
 ui_*.h
 tests/auto/cmake/build
 tests/auto/installed_cmake/build
@@ -107,6 +126,50 @@ tests/auto/qprocess/fileWriterProcess.txt
 .com.apple.timemachine.supported
 tests/auto/qlibrary/libmylib.so*
 tests/auto/qresourceengine/runtime_resource.rcc
+tests/auto/quickcontrols/accessibility/tst_accessibility
+tests/auto/quickcontrols/calendar/tst_calendar
+tests/auto/quickcontrols/controls/basic/tst_basic
+tests/auto/quickcontrols/controls/fusion/tst_fusion
+tests/auto/quickcontrols/controls/imagine/tst_imagine
+tests/auto/quickcontrols/controls/material/tst_material
+tests/auto/quickcontrols/controls/universal/tst_universal
+tests/auto/quickcontrols/cursor/tst_cursor
+tests/auto/quickcontrols/customization/tst_customization
+tests/auto/quickcontrols/focus/tst_focus
+tests/auto/quickcontrols/font/tst_font
+tests/auto/quickcontrols/palette/tst_palette
+tests/auto/quickcontrols/platform/tst_platform
+tests/auto/quickcontrols/pressandhold/tst_pressandhold
+tests/auto/quickcontrols/qquickapplicationwindow/tst_qquickapplicationwindow
+tests/auto/quickcontrols/qquickcolor/tst_qquickcolor
+tests/auto/quickcontrols/qquickdrawer/tst_qquickdrawer
+tests/auto/quickcontrols/qquickiconimage/tst_qquickiconimage
+tests/auto/quickcontrols/qquickiconlabel/tst_qquickiconlabel
+tests/auto/quickcontrols/qquickimaginestyle/tst_qquickimaginestyle
+tests/auto/quickcontrols/qquickmaterialstyle/tst_qquickmaterialstyle
+tests/auto/quickcontrols/qquickmaterialstyleconf/tst_qquickmaterialstyleconf
+tests/auto/quickcontrols/qquickmenu/tst_qquickmenu
+tests/auto/quickcontrols/qquickmenubar/tst_qquickmenubar
+tests/auto/quickcontrols/qquickninepatchimage/tst_qquickninepatchimage
+tests/auto/quickcontrols/qquickpopup/tst_qquickpopup
+tests/auto/quickcontrols/qquickstyle/tst_qquickstyle
+tests/auto/quickcontrols/qquickstyleselector/tst_qquickstyleselector
+tests/auto/quickcontrols/qquickuniversalstyle/tst_qquickuniversalstyle
+tests/auto/quickcontrols/qquickuniversalstyleconf/tst_qquickuniversalstyleconf
+tests/auto/quickcontrols/revisions/tst_revisions
+tests/auto/quickcontrols/sanity/tst_sanity
+tests/auto/quickcontrols/snippets/tst_snippets
+tests/auto/quickcontrols/styles/tst_styles
+tests/auto/quickcontrols/snippets/screenshots/*.png
+tests/benchmarks/creationtime/tst_creationtime
+tests/benchmarks/objectcount/tst_objectcount
+tests/manual/quickcontrols/buttons/buttons
+tests/manual/quickcontrols/fonts/fonts
+tests/manual/quickcontrols/gifs/tst_gifs
+tests/manual/quickcontrols/styles/styles
+tests/manual/quickcontrols/testbench/testbench
+tests/manual/quickcontrols/screenshots/screenshots
+tests/manual/quickcontrols/gifs/gifs/*.gif
 tools/qtestlib/chart/chart*
 tools/qtestlib/updater/updater*
 tools/qmleasing/qmleasing
@@ -301,7 +364,15 @@ src/qml/qml_compile_hash_p.h
 /build*
 CMakeFiles
 CTestTestfile.cmake
+CMakeUserPresets.json
 cmake_install.cmake
 *_autogen
 tst_*.xml
 CMakeLists.txt.user
+
+# QML Language Server ini-files
+.qmlls.ini
+
+# Clangd related
+.cache/*
+compile_commands.json

.tag

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

CMakeLists.txt

@@ -1,6 +1,9 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
 # Generated from qtdeclarative.pro.
 
-cmake_minimum_required(VERSION 3.15.0)
+cmake_minimum_required(VERSION 3.16)
 
 include(.cmake.conf)
 project(QtDeclarative # special case
@@ -10,16 +13,9 @@ project(QtDeclarative # special case
     LANGUAGES CXX C
 )
 
-# special case begin
-# Make sure we only use latest private CMake API, aka no compatibility wrappers.
-set(QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS TRUE)
-
-# Make sure we use the fixed BASE argument of qt_add_resource.
-set(QT_USE_FIXED_QT_ADD_RESOURCE_BASE TRUE)
-# special case end
-
 find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) # special case
-find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui Network Widgets OpenGL OpenGLWidgets Sql Concurrent Test)
+find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui Network Widgets OpenGL OpenGLWidgets Sql Concurrent Test LanguageServerPrivate LinguistTools Svg ExamplesAssetDownloaderPrivate)
+qt_internal_project_setup()
 
 # Set up QT_HOST_PATH as an extra root path to look for the ShaderToolsTools package
 # when cross-compiling.
@@ -32,16 +28,29 @@ endif()
 
 # This can't use the find_package(Qt6 COMPONENTS) signature, because Qt6Config uses NO_DEFAULT and
 # won't look at the prepend extra find root paths.
-find_package(Qt6ShaderToolsTools ${PROJECT_VERSION} QUIET CONFIG)
+find_package(Qt6ShaderToolsTools ${PROJECT_VERSION} QUIET CONFIG
+    PATHS
+            ${_qt_additional_packages_prefix_path}
+            ${_qt_additional_packages_prefix_path_env}
+)
 
 if(NOT "${QT_HOST_PATH}" STREQUAL "")
      set(CMAKE_PREFIX_PATH ${_qt_backup_qtdeclarative_CMAKE_PREFIX_PATH})
      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()
+include("${CMAKE_CURRENT_LIST_DIR}/src/qml/Qt6QmlPublicCMakeHelpers.cmake")
 # special case end
 
 if(NOT QT_FEATURE_commandlineparser)