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

Conflicts:
	doc/qtcreator/src/overview/creator-only/creator-keyboard-shortcuts.qdoc
	doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc
	doc/qtcreator/src/qtquick/qtquick-profiler.qdoc
	src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
	src/plugins/remotelinux/linuxdevicetester.cpp

Change-Id: I3683c1799df05209d05413383456b285a2daf96e

CMakeLists.txt

@@ -166,7 +166,9 @@ endif()
 
 add_subdirectory(src)
 add_subdirectory(share)
-add_subdirectory(dist)
+if (NOT BUILD_DESIGNSTUDIO)
+    add_subdirectory(dist)
+endif()
 
 if (WITH_TESTS)
   add_subdirectory(tests)

cmake/QtCreatorAPIInternal.cmake

@@ -338,12 +338,18 @@ function(add_qtc_depends target_name)
   foreach(obj_lib IN LISTS object_lib_depends)
     target_compile_options(${target_name} PRIVATE $<TARGET_PROPERTY:${obj_lib},INTERFACE_COMPILE_OPTIONS>)
     target_compile_definitions(${target_name} PRIVATE $<TARGET_PROPERTY:${obj_lib},INTERFACE_COMPILE_DEFINITIONS>)
-    target_include_directories(${target_name} PRIVATE $<TARGET_PROPERTY:${obj_lib},INTERFACE_INCLUDE_DIRECTORIES>)
+    if (obj_lib MATCHES "Qt::.*|GoogleTest")
+      set(system_include "SYSTEM")
+    endif()
+    target_include_directories(${target_name} ${system_include} PRIVATE $<TARGET_PROPERTY:${obj_lib},INTERFACE_INCLUDE_DIRECTORIES>)
   endforeach()
   foreach(obj_lib IN LISTS object_public_depends)
     target_compile_options(${target_name} PUBLIC $<TARGET_PROPERTY:${obj_lib},INTERFACE_COMPILE_OPTIONS>)
     target_compile_definitions(${target_name} PUBLIC $<TARGET_PROPERTY:${obj_lib},INTERFACE_COMPILE_DEFINITIONS>)
-    target_include_directories(${target_name} PUBLIC $<TARGET_PROPERTY:${obj_lib},INTERFACE_INCLUDE_DIRECTORIES>)
+    if (obj_lib MATCHES "Qt::.*|GoogleTest")
+      set(system_include "SYSTEM")
+    endif()
+    target_include_directories(${target_name} ${system_include} PUBLIC $<TARGET_PROPERTY:${obj_lib},INTERFACE_INCLUDE_DIRECTORIES>)
   endforeach()
 endfunction()
 

doc/qtcreator/src/debugger/qtquick-debugger-example.qdoc

@@ -33,7 +33,7 @@
     \if defined(qtdesignstudio)
     \note In this tutorial, you are using advanced menu items. These are not
     visible by default. To toggle the visibility of advanced menu items, see
-    \l{Customizing the Menu}.
+    \l{Customizing the Menu Bar}.
 
     \endif
 

doc/qtcreator/src/debugger/qtquick-debugging.qdoc

@@ -35,7 +35,7 @@
     \if defined(qtdesignstudio)
     \note In this section, you are using advanced menu items. These are not
     visible by default. To toggle the visibility of advanced menu items, see
-    \l{Customizing the Menu}.
+    \l{Customizing the Menu Bar}.
     \endif
 
     \section1 Setting Up QML Debugging

doc/qtcreator/src/external-resources/external-resources-qds.qdoc

@@ -69,3 +69,39 @@
     \externalpage https://www.qt.io/download
     \title Try Qt
 */
+/*!
+    \externalpage https://doc.qt.io/qt-5/custom-material-reference.html
+    \title Qt Quick 3D Custom Material Reference
+*/
+/*!
+    \externalpage https://doc.qt.io/qt-5/qml-qtquick3d-arealight.html
+    \title AreaLight
+*/
+/*!
+    \externalpage https://doc.qt.io/qt-5/qml-qtquick3d-shaderinfo.html
+    \title ShaderInfo
+*/
+/*!
+    \externalpage https://doc.qt.io/qt-5/qml-qtquick3d-bufferblit.html
+    \title BufferBlit
+*/
+/*!
+    \externalpage https://doc.qt.io/qt-5/qml-qtquick3d-cullmode.html
+    \title CullMode
+*/
+/*!
+    \externalpage https://doc.qt.io/qt-5/qml-qtquick3d-depthinput.html
+    \title DepthInput
+*/
+/*!
+    \externalpage https://doc.qt.io/qt-5/qml-qtquick3d-renderstate.html
+    \title RenderState
+*/
+/*!
+    \externalpage https://doc.qt.io/qt/i18n-source-translation.html#mark-strings-for-translation
+    \title Mark Strings for Translation
+*/
+/*!
+    \externalpage https://doc.qt.io/qt/linguist-id-based-i18n.html
+    \title Text ID based translations
+*/

doc/qtcreator/src/qtquick/qtquick-profiler.qdoc

@@ -27,7 +27,7 @@
     \if defined(qtdesignstudio)
     \note In this section, you are using advanced menu items. These are not
     visible by default. To toggle the visibility of advanced menu items, see
-    \l{Customizing the Menu}.
+    \l{Customizing the Menu Bar}.
     \endif
 
 

doc/qtcreator/src/user-interface/creator-file-system-view.qdoc

@@ -1,4 +1,4 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -15,7 +15,11 @@
 
     \title File System
 
+    \if defined(qtdesignstudio)
+    \brief View all the files in the current directory.
+    \else
     \brief Shows all the files in the current directory.
+    \endif
 
     \if defined(qtcreator)
     \note Usually, \l{Navigate with locator}{searching with the locator}
@@ -25,7 +29,7 @@
 
     \image qtcreator-filesystem-view.webp {File System view in the sidebar}
     \else
-    \image qtcreator-filesystem-view-design.webp {File System view}
+    \image filesystem-view-design.webp {File System view}
     \endif
 
     To go to the root directory of the file system, select \uicontrol Computer
@@ -52,6 +56,7 @@
     The view displays the path to the active file as bread crumbs. You can move
     to any directory along the path by clicking it.
 
+    \if defined(qtcreator)
     \section1 File System Context Menu
 
     Use the context menu functions to:
@@ -64,34 +69,24 @@
             that has the file. To specify the terminal to use on Linux and
             \macos, select \preferences > \uicontrol Environment >
             \uicontrol System.
-            \if defined(qtcreator)
             To use an \l{Terminal} {internal terminal}, select \preferences >
             \uicontrol Terminal > \uicontrol {Use internal terminal}.
-            \endif
         \li Search in the selected directory.
         \li View file properties, such as name, path, MIME type, default editor,
             line endings, indentation, owner, size, last read and modified
             dates, and permissions.
-        \li Create new files. For more information, see
+        \li Create new files. For more information, see {Create files}.
-            \if defined(qtdesignstudio)
-            \l{Adding Files to Projects}.
-            \else
-            \l{Create files}.
-            \endif
         \li Rename existing files. To move the file to another directory, enter
             the relative or absolute path to its new location in addition to the
             new filename.
         \li Remove existing files.
         \li Create new folders.
-        \if defined(qtcreator)
         \li Compare the selected file with the currently open file in the diff
             editor. For more information, see \l{Compare files}.
-        \endif
         \li Display the contents of a particular directory in the view.
         \li Collapse all open folders.
     \endlist
 
-    \if defined(qtcreator)
     \section1 File System View Toolbar
 
     The toolbar in the \uicontrol {File System} view has additional

doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc

@@ -1,4 +1,4 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -16,13 +16,26 @@
 
     \title Open Documents
 
+    \if defined(qtdesignstudio)
+    \brief View currently open files.
+    \else
     \brief Shows currently open files.
+    \endif
 
+    \if defined(qtdesignstudio)
+    \image open-documents-view.webp {Open Documents view}
+    \else
     \image qtcreator-open-documents-view.png {Open Documents view}
+    \endif
 
     You can use the context menu to apply some of the functions also available
-    in the \uicontrol File menu and in the \l {File System Context Menu}
+    in the \uicontrol File menu and in the
-    {File System} view to the file that you select in the view.
+    \if defined(qtcreator)
+    \l {File System Context Menu}{File System}
+    \else
+    \uicontrol {File System}
+    \endif
+    view to the file that you select in the view.
 
     In addition, you can:
 

doc/qtcreator/src/user-interface/creator-projects-view.qdoc

@@ -1,4 +1,4 @@
-// Copyright (C) 2023 The Qt Company Ltd.
+// Copyright (C) 2024 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
@@ -15,7 +15,11 @@
 
     \title Projects
 
+    \if defined(qtdesignstudio)
+    \brief View a list of the files contained within the open project.
+    \else
     \brief Shows a list of projects in a project tree.
+    \endif
 
     \if defined(qtcreator)
     The project tree has a list of all projects open in the current
@@ -29,7 +33,7 @@
     is the fastest way to find a particular project, file, class, or function,
     or almost anything else in your project.
     \else
-    \image qtcreator-projects-view-design.png {Projects view}
+    \image projects-view-design.webp {Projects view}
     \endif
 
     You can use the project tree in the following ways:
@@ -43,14 +47,19 @@
             Use the \l{Switch between modes} {mode selector} to open the current
             file in another editor.
             \endif
-        \li To bring up a \l{Projects View Context Menu}{context menu}
+        \li To open a
+            \if defined(qtcreator)
+            \l{Projects View Context Menu}{context menu}
+            \else
+            context menu
+            \endif
             that has the actions most commonly needed, right-click an
             item in the project tree. For example, through the menu of
             the project root directory you can, among other actions, run
             and close the project.
         \li To see the absolute path of a file, move the mouse pointer over the
             file name.
-        \li To move files from one project to another, drag-and-drop them
+        \li To move files from one project to another, drag them
             in the project tree. \QC makes the necessary changes to project
             configuration files.
     \endlist
@@ -58,6 +67,7 @@
     \note If you cannot see a file in the \l Projects view, switch to the
     \uicontrol {File System} view, which shows all the files in the file system.
 
+    \if defined(qtcreator)
     \section1 Projects View Context Menu
 
     The \uicontrol Projects view has context menus for managing projects,
@@ -65,22 +75,15 @@
     projects and subprojects:
 
     \list
-        \if defined(qtcreator)
         \li Set a project as the active project.
-        \endif
         \li Execute \uicontrol Build menu commands.
         \li Create new files. For more information, see
-            \if defined(qtdesignstudio)
-            \l{Adding Files to Projects}.
-            \else
             \l{Create files}.
-            \endif
         \li Rename existing files. If you change the base name of a
             file, \QC displays a list of other files with the same base name
             and offers to rename them as well. If you rename a UI file (.ui),
             \QC also changes corresponding include statements accordingly.
         \li Remove existing files.
-        \if defined(qtcreator)
         \li Remove existing directories from \l{Import an existing project}
             {generic projects}.
         \li Add existing files and directories.
@@ -88,16 +91,13 @@
             \l{Add libraries to qmake projects}.
         \li Add and remove subprojects.
         \li Find unused functions.
-        \endif
         \li Search in the selected directory.
 
         \li Open a terminal window in the project directory. To specify the
             terminal to use on Linux and \macos, select \preferences >
             \uicontrol Environment > \uicontrol System.
-            \if defined(qtcreator)
             To use an \l{Terminal}{internal terminal}, select \preferences >
             \uicontrol Terminal > \uicontrol {Use internal terminal}.
-            \endif
         \li Open a terminal window in the project directory that you configured
             for building or running the project.
         \li Expand or collapse the tree view to show or hide all files and
@@ -114,7 +114,6 @@
     the \l {File System} view. To view a project in it, select
     \uicontrol {Show in File System View}.
 
-    \if defined(qtcreator)
     \section1 Projects View Toolbar
 
     The toolbar in the \uicontrol Projects view has additional options.

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

@@ -95,7 +95,7 @@
     \endif
 
     \if defined(qtdesignstudio)
-    \section1 Customizing the Menu
+    \section1 Customizing the Menu Bar
 
     By default, top-level menu items \uicontrol Build, \uicontrol Debug, and
     \uicontrol Analyze are not visible. These menu items have options for
@@ -113,6 +113,9 @@
 
     You need to restart \QDS to apply changes made to these settings.
 
+    \note To show or hide the \uicontrol {Menu Bar}, select \uicontrol View >
+    \uicontrol {Show Menu Bar}, or use \key {Ctrl+Alt+M}.
+
     \section1 Customizing the UI
 
     The following topics describe how to customize the UI:

doc/qtcreator/src/vcs/creator-vcs-git.qdoc

@@ -30,10 +30,6 @@
     You can use the \l{http://code.google.com/p/gerrit/}{Gerrit} code review
     tool for projects that use Git.
 
-    \if defined(qtdesignstudio)
-    \include creator-vcs-options.qdocinc vcs options
-    \endif
-
     \if defined(qtcreator)
     \section1 Using Git for Windows
 

doc/qtdesignstudio/config/qtdesignstudio.qdocconf

@@ -120,4 +120,9 @@ macro.function                  = "\\fn"
 macro.QMLD                      = "Qt Design Studio"
 
 navigation.landingpage = "$IDE_DISPLAY_NAME Manual"
+
+# Auto-generate navigation linking based on "All Topics":
+navigation.toctitles = "All Topics"
+navigation.toctitles.inclusive = false
+
 buildversion = "$IDE_DISPLAY_NAME Manual $QTC_VERSION"

doc/qtdesignstudio/examples/doc/FresnelExample.qdoc

@@ -0,0 +1,90 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+/*!
+    \page fresnel-effect-example.html
+    \ingroup studioexamples
+
+    \title Fresnel Example
+    \brief Illustrates how to work with the fresnel effect.
+
+    \image fresnel-example.webp
+
+    The \e{Fresnel} example illustrates how to add and adjust a fresnel effect on
+    a 3D model.
+
+    The fresnel effect affects how materials reflect light at different viewing angles. Imagine the
+    water on a lake. If you look down at the water from straight above, you can see through the
+    water, but if you look from a lower angle, the reflections are stronger.
+
+    \image fresnel-angle.webp
+
+    \section1 Running the Example
+
+    To run the example in \QDS, go to the \uicontrol Welcome screen and select the example
+    from the \uicontrol Examples tab.
+
+    \section1 The 3D Scene
+
+    The example project consists of a basic 3D scene with the following components:
+
+    \list
+      \li A 3D model.
+      \li A directional light.
+      \li An HDR image used to light the scene (image-based lighting).
+    \endlist
+
+    \section1 The Material
+
+    The material on the 3D model in this example is a principled material with a
+    clearcoat.
+
+    \section2 Clearcoat
+
+    A clearcoat is an additional specular layer applied to the surface of a material. The
+    clearcoating is transparent and doesn't add any color to the material, but it affects
+    how light interacts with the material.
+
+    You adjust clearcoat properties independently from the base material.
+
+    \section2 Fresnel Properties
+
+    The following properties affect how the fresnel effect renders. These properties are
+    available both for the base material and the clearcoat layer. Adjusting the settings for the
+    clearcoat has a bigger visual effect.
+
+    \table
+      \header
+        \li Property
+        \li Description
+      \row
+        \li Fresnel power
+        \li Increasing the fresnel power decreases the head-on reflections (steep viewing angle)
+            while maintaining the reflections seen from more shallow viewing angles.
+      \row
+        \li Enable scale and bias
+        \li Takes the scale and bias properties into account.
+      \row
+        \li Scale
+        \li Determines the rate of change in reflection intensity as the viewing angle varies. A
+        large scale value results in a gentler transition between weak and strong reflections, while
+        a smaller scale creates a more abrupt shift in reflection intensity.
+      \row
+        \li Bias
+        \li Controls the offset for the fresnel power property and determines how quickly the
+        reflection transitions from weak to strong as the viewing
+        angle changes. A larger bias value shifts the transition point toward steeper angles.
+    \endtable
+
+    \section3 Adjusting the Fresnel Settings
+
+    To adjust the settings:
+
+    \list 1
+      \li In \uicontrol {Material Browser}, double-click \e {Monkey Material}.
+      \li In \uicontrol {Material Editor}, find the properties under
+      \uicontrol {Clearcoat} and \uicontrol {Fresnel} respectively.
+    \endlist
+
+    \note You see the changes live as you edit them in the \uicontrol 2D view.
+*/

doc/qtdesignstudio/examples/doc/rainSnowParticles.qdoc

@@ -41,7 +41,7 @@
 
     Now you have added a particle system to your scene.
 
-    \image rain-snow-tutorial-particle-system
+    \image rain-snow-tutorial-particle-system.png
 
     \section2 Adjusting the Behavior and Apperance of the Particle System
     Next, you adjust the position, behavior, and apperance of the particle