7 files changed, 46 insertions, 17 deletions
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf
index 13746b13de..91458527dd 100644
--- a/src/quick/doc/qtquick.qdocconf
+++ b/src/quick/doc/qtquick.qdocconf
@@ -38,12 +38,14 @@ qhp.QtQuick.subprojects.examples.selectors = fake:example
 
 tagfile                 = ../../../doc/qtquick/qtquick.tags
 
-depends += qtcore qtqml qtqmltest qtgui qtlinguist qtquickcontrols1 qtquickcontrols qtdoc qtquickdialogs qtsensors qtwidgets qmake qtmultimedia qtgraphicaleffects qtsql qtxmlpatterns
+depends += qtcore qtqml qtqmltest qtgui qtlinguist qtquickcontrols qtquickcontrols1 qtdoc qtquickdialogs qtsensors qtwidgets qmake qtmultimedia qtgraphicaleffects qtsql qtxmlpatterns
 
 headerdirs  += ..\
+               ../../quick \
                ../../quickwidgets
 
 sourcedirs  += .. \
+               ../../quick \
                ../../quickwidgets
 
 exampledirs +=  ../../../examples/quick \
diff --git a/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc b/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc
index e4d837112f..7695bb57db 100644
--- a/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc
+++ b/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc
@@ -227,7 +227,7 @@ access to the data from QML:
 
 The QSqlQueryModel class is good enough to implement a custom read-only
 model that represents data in an SQL database. The
-\l{Qt Quick Controls 2 - Chat Tutorial}{chat tutorial} example
+\l{Qt Quick Controls - Chat Tutorial}{chat tutorial} example
 demonstrates this very well by implementing a custom model to fetch the
 contact details from an SQLite database.
 
diff --git a/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc b/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc
index b96d09996d..e09c430e43 100644
--- a/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc
+++ b/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc
@@ -341,9 +341,15 @@ OpenGL application is allowed to draw.
 The \l {Scene Graph - OpenGL Under QML} example gives an example on
 how to use these signals using OpenGL.
 
+The \l {Scene Graph - Direct3D 11 Under QML} example gives an example on
+how to use these signals using Direct3D.
+
 The \l {Scene Graph - Metal Under QML} example gives an example on
 how to use these signals using Metal.
 
+The \l {Scene Graph - Vulkan Under QML} example gives an example on
+how to use these signals using Vulkan.
+
 The other alternative, only available for OpenGL currently, is to create a
 QQuickFramebufferObject, render into it, and let it be displayed in the scene
 graph as a texture. The \l {Scene Graph - Rendering FBOs} example shows how
@@ -352,6 +358,13 @@ and multiple threads to create content to be displayed in the scene graph. The
 \l {Scene Graph - Rendering FBOs in a thread} examples show how this can be
 done.
 
+Graphics APIs other than OpenGL can also follow this approach, even though
+QQuickFramebufferObject does not currently support them. Creating and rendering
+to a texture directly with the underlying API, followed by wrapping and using
+this resource in a Qt Quick scene in a custom QQuickItem, is demonstrated in
+the \l {Scene Graph - Metal Texture Import} example. That example uses Metal,
+the concepts however apply to all other graphics APIs as well.
+
 \warning When mixing OpenGL content with scene graph rendering, it is
 important the application does not leave the OpenGL context in a state
 with buffers bound, attributes enabled, special values in the z-buffer
@@ -1003,6 +1016,14 @@ with multiple windows.
    \li Where applicable (Vulkan, Direct3D), enables the graphics API implementation's debug
    and/or validation layers, if available.
 
+  \row
+   \li \c QSG_RHI_PREFER_SOFTWARE_RENDERER
+   \li \c 1
+   \li Requests choosing an adapter or physical device that uses software-based
+   rasterization. Applicable only when the underlying API has support for
+   enumerating adapters (for example, Direct3D or Vulkan), and is ignored
+   otherwise.
+
   \endtable
 
   Applications wishing to always run with a single given graphics API, can
@@ -1018,4 +1039,9 @@ with multiple windows.
   equivalent in effect to running with both \c QSG_RHI and \c QSG_RHI_BACKEND
   set.
 
+  All QRhi backends will choose the system default GPU adapter or physical
+  device, unless overridden by \c{QSG_RHI_PREFER_SOFTWARE_RENDERER} or a
+  backend-specific variable, such as, \c{QT_D3D_ADAPTER_INDEX} or
+  \c{QT_VK_PHYSICAL_DEVICE_INDEX}. No further adapter configurability is
+  provided at this time.
  */
diff --git a/src/quick/doc/src/examples.qdoc b/src/quick/doc/src/examples.qdoc
index 9034c90eb8..8c31e13a2d 100644
--- a/src/quick/doc/src/examples.qdoc
+++ b/src/quick/doc/src/examples.qdoc
@@ -171,16 +171,17 @@ Creator.
     \div {class="doc-column"}
         \b{Scene Graph}
         \list
-        \li \l{Scene Graph - OpenGL Under QML}{OpenGL Under QML}
+        \li \l{Scene Graph - Custom Geometry}{Custom Geometry}
         \li \l{Scene Graph - Metal Under QML}{Metal Under QML}
+        \li \l{Scene Graph - Metal Texture Import}{Metal Texture Import}
+        \li \l{Scene Graph - OpenGL Under QML}{OpenGL Under QML}
         \li \l{Scene Graph - Direct3D 11 Under QML}{Direct3D 11 Under QML}
+        \li \l{Scene Graph - Custom Rendering with QSGRenderNode}{Render Node}
         \li \l{Scene Graph - Painted Item}{Painted Item}
-        \li \l{Scene Graph - Custom Geometry}{Custom Geometry}
         \li \l{Scene Graph - Graph}{Graph}
         \li \l{Scene Graph - Simple Material}{Simple Material}
         \li \l{Scene Graph - Rendering FBOs}{Rendering FBOs}
         \li \l{Scene Graph - Rendering FBOs in a thread}{Rendering FBOs in a thread}
-        \li \l{Scene Graph - Custom Rendering with QSGRenderNode}{Render Node}
         \endlist
     \enddiv
 \enddiv
diff --git a/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc b/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc
index dd7f21e81a..f4a1616943 100644
--- a/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc
+++ b/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc
@@ -45,9 +45,9 @@ UI. It is recommended to browse this list of UI controls before creating your
 own custom UI control.
 
 Besides these basic UI controls offered by Qt Quick itself, a rich set of UI
-controls are also available with Qt Quick Controls 2. They cater to the most
+controls are also available with Qt Quick Controls. They cater to the most
 common use cases without any change, and offer a lot more possibilities with their
-customization options. In particular, Qt Quick Controls 2 provides styling
+customization options. In particular, Qt Quick Controls provides styling
 options that align with the latest UI design trends. If these UI controls do not
 satisfy your application's needs, only then it is recommended to create a
 custom control.
@@ -55,7 +55,7 @@ custom control.
 
 \section2 Related Information
 \list
-\li \l{Qt Quick Controls 2}
+\li \l{Qt Quick Controls}
 \li \l{Qt Quick}
 \endlist
 
@@ -323,7 +323,7 @@ see \l {Choosing the Correct Integration Method Between C++ and QML}.
 \section2 Related Information
 \list
 \li \l{Integrating QML and C++}
-\li \l{Qt Quick Controls 2 - Chat Tutorial}{Chat application tutorial}
+\li \l{Qt Quick Controls - Chat Tutorial}{Chat application tutorial}
 \endlist
 
 \section1 Using Qt Quick Layouts
@@ -426,7 +426,7 @@ developers to follow these tips:
  \li Use anchors or the Qt Quick Layouts module to lay out the visual items.
  \li Do not specify explicit width and height for a visual item.
  \li Provide UI resources such as images and icons for each display resolution
-     that your application supports. The Qt Quick Controls 2 gallery example
+     that your application supports. The Qt Quick Controls gallery example
      demonstrates this well by providing the \c qt-logo.png for \c @2x, \c @3x,
      and \c @4x resolutions, enabling the application to cater to high
      resolution displays. Qt automatically chooses the appropriate
@@ -437,7 +437,7 @@ developers to follow these tips:
      versions of an image, as is necessary with bitmap images.
  \li Use font-based icons, such as Font Awesome. These scale to any display
      resolution, and also allow colorization. The
-     Qt Quick Controls 2 Text Editor example demonstrates this well.
+     Qt Quick Controls Text Editor example demonstrates this well.
 \endlist
 
 With this in place, your application's UI should scale depending
@@ -448,8 +448,8 @@ on the display resolution on offer.
 \section2 Related Information
 
 \list
- \li \l{Qt Quick Controls 2 - Gallery}{Gallery example}
- \li \l{Qt Quick Controls 2 - Text Editor}{Text Editor example}
+ \li \l{Qt Quick Controls - Gallery}{Gallery example}
+ \li \l{Qt Quick Controls - Text Editor}{Text Editor example}
  \li \l{Font Awesome}
  \li \l{Scalability}
  \li \l{High DPI Displays}
diff --git a/src/quick/doc/src/guidelines/qtquick-toolsnutilities.qdoc b/src/quick/doc/src/guidelines/qtquick-toolsnutilities.qdoc
index 0669ec06c8..84741efa61 100644
--- a/src/quick/doc/src/guidelines/qtquick-toolsnutilities.qdoc
+++ b/src/quick/doc/src/guidelines/qtquick-toolsnutilities.qdoc
@@ -39,15 +39,15 @@ information about them.
 
 The Qt Quick Designer enables designing Qt Quick-based UIs using simple
 drag-n-drop gestures that most designers are familiar with. It offers UI
-elements from the Qt Quick and Qt Quick Controls 2 modules, as well as
+elements from the Qt Quick and Qt Quick Controls modules, as well as
 integration for custom UI elements.
 
 The following is a list of example applications that use UIs created by
 the Qt Quick Designer:
 
 \list
- \li \l{Qt Quick Controls 2 - Contact List}
- \li \l{Qt Quick Controls 2 - Flat Style}
+ \li \l{Qt Quick Controls - Contact List}
+ \li \l{Qt Quick Controls - Flat Style}
 \endlist
 
 \section2 QML Debugger and Profiler
diff --git a/src/quick/doc/src/qtquick.qdoc b/src/quick/doc/src/qtquick.qdoc
index 7f72217279..4b843f366b 100644
--- a/src/quick/doc/src/qtquick.qdoc
+++ b/src/quick/doc/src/qtquick.qdoc
@@ -43,7 +43,7 @@ QML types for creating user interfaces with the QML language, and a
 \l{Qt Quick C++ Classes}{C++ API} for extending QML applications with C++ code.
 
 \note A set of Qt Quick-based UI controls is also available to create user
-interfaces. See \l{Qt Quick Controls 2} for more information.
+interfaces. See \l{Qt Quick Controls} for more information.
 
 For those new to QML and Qt Quick, please see
 \l{QML Applications}