Merge remote-tracking branch 'origin/qds/dev'

Conflicts: src/libs/utils/filepath.cpp
  src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp
  src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp
  tests/unit/unittest/CMakeLists.txt

Change-Id: I017a6075db41a5233487ac855ffe23de2b2bb0ee

.gitignore-blame

@@ -0,0 +1,2 @@
+#bulk clang-format for src/plugins/qmldesigner/components/stateseditor/
+fef7852da53b84c7fb960b18fef8cda0b6663703

cmake/QtCreatorAPI.cmake

@@ -821,7 +821,7 @@ endfunction()
 
 function(add_qtc_test name)
   cmake_parse_arguments(_arg "GTEST;MANUALTEST;EXCLUDE_FROM_PRECHECK" "TIMEOUT"
-      "DEFINES;DEPENDS;INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;SKIP_PCH;CONDITION" ${ARGN})
+      "DEFINES;DEPENDS;INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;SKIP_PCH;CONDITION;PROPERTIES" ${ARGN})
 
   if (${_arg_UNPARSED_ARGUMENTS})
     message(FATAL_ERROR "add_qtc_test had unparsed arguments!")
@@ -881,6 +881,7 @@ function(add_qtc_test name)
     VISIBILITY_INLINES_HIDDEN ON
     BUILD_RPATH "${_RPATH_BASE}/${_RPATH};${CMAKE_BUILD_RPATH}"
     INSTALL_RPATH "${_RPATH_BASE}/${_RPATH};${CMAKE_INSTALL_RPATH}"
+    ${_arg_PROPERTIES}
   )
   if (NOT _arg_SKIP_PCH)
     enable_pch(${name})

doc/config/macros.qdocconf

@@ -50,6 +50,7 @@ macro.beginfloatright.HTML  = "<div style=\"float: right; margin-left: 2em\">"
 macro.endfloat.HTML         = "</div>"
 macro.clearfloat.HTML       = "<br style=\"clear: both\" />"
 macro.emptyspan.HTML	    = "<span></span>"
+macro.externallink.HTML     = "<a href=\"\1\" target=\"_blank\">\2</a>"
 
 # Embed YouTube content by video ID - Example: \youtube dQw4w9WgXcQ
 # Also requires a <ID>.jpg thumbnail for offline docs. In .qdocconf, add:

doc/qtcreator/src/user-interface/creator-ui.qdoc

@@ -299,6 +299,14 @@
     style.
     \endif
 
+    \if defined(qtdesignstudio)
+    The mode selector is hidden by default.
+
+    To show the mode selector, go to \uicontrol Views >
+    \uicontrol {Mode Selector Style} and select \uicontrol {Icons and Text}
+    or \uicontrol {Icons Only}.
+    \endif
+
 
     You can use \QC in the following modes:
 

doc/qtdesignstudio/examples/doc/materialbundle.qdoc

@@ -0,0 +1,33 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+/*!
+    \page material-bundle-example.html
+    \ingroup studioexamples
+    \sa {Content Library}
+
+    \title Material Bundle
+    \brief Showcases the materials in \uicontrol {Content Library} and the real-time rendering
+    capabilities of \QDS.
+
+    \image material-bundle-example.webp
+
+    The \e{Material Bundle} example showcases the materials included in the \QDS
+    \uicontrol {Content Library} and the real-time 3D rendering capabilities of \QDS.
+
+    Run the project to:
+
+    \list
+      \li Select the material for two different meshes; all material bundle materials are available.
+      \li Navigate (rotate and zoom) with the mouse.
+      \li Choose between two different environment light options.
+    \endlist
+
+    \section1 The Material Bundle
+
+    The material bundle is included in \uicontrol {Content Library} which is
+    included in the \QDS Enterprise license. It contains a ready-made set of materials that you
+    can apply to your 3D models by dragging and dropping.
+
+    \image content-library.webp
+*/