Let examples show up in Qt Creator again

Fix an issue where the relative paths in the generated
examples-manifest.xml did miss the parent directory, effectively
blocking the examples from being shown in the Qt Creator
Welcome screen.

This broke in commit c403e775f60a, where the exampledirs path
was changed from "../../../examples" to "../../../examples/multimedia"
and "../../../examples/multimediawidgets". This made qdoc miss the
"multimedia" and "multimediawidgets" directories in the generated paths.

To fix this, the patch
* moves all the multimediawidgets examples to multimedia
* sets examplesinstallpath to "multimedia"

The unification of directories is needed because there can be only one
examplesinstallpath per qdoc project.

Fixes: QTBUG-104943
Change-Id: I4d1b1f857563ec23b4d60028ca08d0470ba96298
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit c3081f86f4fc53509d853a2b88aff88df8c55d87)
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

62 files changed, 37 insertions, 32 deletions

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 7c3b8b2dc..638f2b0ef 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -4,6 +4,5 @@ add_subdirectory(multimedia)
 if (QT_FEATURE_spatialaudio)
     add_subdirectory(spatialaudio)
 endif()
-add_subdirectory(multimediawidgets)
 
 qt_examples_build_end()
diff --git a/examples/examples.pro b/examples/examples.pro
index 5d1718718..3cda36046 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
-SUBDIRS += multimedia multimediawidgets spatialaudio
 
+SUBDIRS += multimedia spatialaudio
diff --git a/examples/multimedia/CMakeLists.txt b/examples/multimedia/CMakeLists.txt
index 6123c7994..19a999541 100644
--- a/examples/multimedia/CMakeLists.txt
+++ b/examples/multimedia/CMakeLists.txt
@@ -3,13 +3,17 @@ if(NOT ANDROID AND NOT IOS)
     qt_internal_add_example(devices)
 endif()
 if(TARGET Qt::Widgets)
-    qt_internal_add_example(spectrum)
-    qt_internal_add_example(audiorecorder)
     if(NOT ANDROID AND NOT IOS)
         qt_internal_add_example(audiodevices)
     endif()
-    qt_internal_add_example(audiosource)
     qt_internal_add_example(audiooutput)
+    qt_internal_add_example(audiorecorder)
+    qt_internal_add_example(audiosource)
+    qt_internal_add_example(camera)
+    qt_internal_add_example(player)
+    qt_internal_add_example(spectrum)
+    qt_internal_add_example(videographicsitem)
+    qt_internal_add_example(videowidget)
 endif()
 if(TARGET Qt::Quick)
     qt_internal_add_example(declarative-camera)
diff --git a/examples/multimediawidgets/camera/CMakeLists.txt b/examples/multimedia/camera/CMakeLists.txt
index 530126ba5..2c2c2a935 100644
--- a/examples/multimediawidgets/camera/CMakeLists.txt
+++ b/examples/multimedia/camera/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.16)
 project(camera LANGUAGES CXX)
 
@@ -8,7 +11,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/multimediawidgets/camera")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/multimedia/camera")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Multimedia MultimediaWidgets Widgets)
 
diff --git a/examples/multimediawidgets/camera/android/AndroidManifest.xml b/examples/multimedia/camera/android/AndroidManifest.xml
index 29c4672cf..29c4672cf 100644
--- a/examples/multimediawidgets/camera/android/AndroidManifest.xml
+++ b/examples/multimedia/camera/android/AndroidManifest.xml
diff --git a/examples/multimediawidgets/camera/camera.cpp b/examples/multimedia/camera/camera.cpp
index 201e6e985..201e6e985 100644
--- a/examples/multimediawidgets/camera/camera.cpp
+++ b/examples/multimedia/camera/camera.cpp
diff --git a/examples/multimediawidgets/camera/camera.h b/examples/multimedia/camera/camera.h
index ae8eb5919..ae8eb5919 100644
--- a/examples/multimediawidgets/camera/camera.h
+++ b/examples/multimedia/camera/camera.h
diff --git a/examples/multimediawidgets/camera/camera.pro b/examples/multimedia/camera/camera.pro
index e1d98c06e..283d84640 100644
--- a/examples/multimediawidgets/camera/camera.pro
+++ b/examples/multimedia/camera/camera.pro
@@ -30,7 +30,7 @@ android|ios {
 }
 RESOURCES += camera.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/camera
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/camera
 INSTALLS += target
 
 QT += widgets
diff --git a/examples/multimediawidgets/camera/camera.qrc b/examples/multimedia/camera/camera.qrc
index a915eb596..a915eb596 100644
--- a/examples/multimediawidgets/camera/camera.qrc
+++ b/examples/multimedia/camera/camera.qrc
diff --git a/examples/multimediawidgets/camera/camera.ui b/examples/multimedia/camera/camera.ui
index 560ee7fed..560ee7fed 100644
--- a/examples/multimediawidgets/camera/camera.ui
+++ b/examples/multimedia/camera/camera.ui
diff --git a/examples/multimediawidgets/camera/camera_mobile.ui b/examples/multimedia/camera/camera_mobile.ui
index 7f269b17b..7f269b17b 100644
--- a/examples/multimediawidgets/camera/camera_mobile.ui
+++ b/examples/multimedia/camera/camera_mobile.ui
diff --git a/examples/multimediawidgets/camera/doc/images/camera-example.png b/examples/multimedia/camera/doc/images/camera-example.png
index 12e1b5728..12e1b5728 100644
--- a/examples/multimediawidgets/camera/doc/images/camera-example.png
+++ b/examples/multimedia/camera/doc/images/camera-example.png
diff --git a/examples/multimediawidgets/camera/doc/src/camera.qdoc b/examples/multimedia/camera/doc/src/camera.qdoc
index 7a3b88d1b..7a3b88d1b 100644
--- a/examples/multimediawidgets/camera/doc/src/camera.qdoc
+++ b/examples/multimedia/camera/doc/src/camera.qdoc
diff --git a/examples/multimediawidgets/camera/images/shutter.svg b/examples/multimedia/camera/images/shutter.svg
index 18493361d..18493361d 100644
--- a/examples/multimediawidgets/camera/images/shutter.svg
+++ b/examples/multimedia/camera/images/shutter.svg
diff --git a/examples/multimediawidgets/camera/imagesettings.cpp b/examples/multimedia/camera/imagesettings.cpp
index a107cc62d..a107cc62d 100644
--- a/examples/multimediawidgets/camera/imagesettings.cpp
+++ b/examples/multimedia/camera/imagesettings.cpp
diff --git a/examples/multimediawidgets/camera/imagesettings.h b/examples/multimedia/camera/imagesettings.h
index 13bd6dc4a..13bd6dc4a 100644
--- a/examples/multimediawidgets/camera/imagesettings.h
+++ b/examples/multimedia/camera/imagesettings.h
diff --git a/examples/multimediawidgets/camera/imagesettings.ui b/examples/multimedia/camera/imagesettings.ui
index 8c59ca01d..8c59ca01d 100644
--- a/examples/multimediawidgets/camera/imagesettings.ui
+++ b/examples/multimedia/camera/imagesettings.ui
diff --git a/examples/multimediawidgets/camera/ios/Info.plist.in b/examples/multimedia/camera/ios/Info.plist.in
index 6a6b8db11..6a6b8db11 100644
--- a/examples/multimediawidgets/camera/ios/Info.plist.in
+++ b/examples/multimedia/camera/ios/Info.plist.in
diff --git a/examples/multimediawidgets/camera/macos/Info.plist.in b/examples/multimedia/camera/macos/Info.plist.in
index ae2d945f1..ae2d945f1 100644
--- a/examples/multimediawidgets/camera/macos/Info.plist.in
+++ b/examples/multimedia/camera/macos/Info.plist.in
diff --git a/examples/multimediawidgets/camera/main.cpp b/examples/multimedia/camera/main.cpp
index 50b411e4e..50b411e4e 100644
--- a/examples/multimediawidgets/camera/main.cpp
+++ b/examples/multimedia/camera/main.cpp
diff --git a/examples/multimediawidgets/camera/metadatadialog.cpp b/examples/multimedia/camera/metadatadialog.cpp
index 096217014..096217014 100644
--- a/examples/multimediawidgets/camera/metadatadialog.cpp
+++ b/examples/multimedia/camera/metadatadialog.cpp
diff --git a/examples/multimediawidgets/camera/metadatadialog.h b/examples/multimedia/camera/metadatadialog.h
index 5bb5a4b0b..5bb5a4b0b 100644
--- a/examples/multimediawidgets/camera/metadatadialog.h
+++ b/examples/multimedia/camera/metadatadialog.h
diff --git a/examples/multimediawidgets/camera/videosettings.cpp b/examples/multimedia/camera/videosettings.cpp
index b2c62bafc..b2c62bafc 100644
--- a/examples/multimediawidgets/camera/videosettings.cpp
+++ b/examples/multimedia/camera/videosettings.cpp
diff --git a/examples/multimediawidgets/camera/videosettings.h b/examples/multimedia/camera/videosettings.h
index 2f356d90f..2f356d90f 100644
--- a/examples/multimediawidgets/camera/videosettings.h
+++ b/examples/multimedia/camera/videosettings.h
diff --git a/examples/multimediawidgets/camera/videosettings.ui b/examples/multimedia/camera/videosettings.ui
index 3c1f71f11..3c1f71f11 100644
--- a/examples/multimediawidgets/camera/videosettings.ui
+++ b/examples/multimedia/camera/videosettings.ui
diff --git a/examples/multimediawidgets/camera/videosettings_mobile.ui b/examples/multimedia/camera/videosettings_mobile.ui
index 6584f07f9..6584f07f9 100644
--- a/examples/multimediawidgets/camera/videosettings_mobile.ui
+++ b/examples/multimedia/camera/videosettings_mobile.ui
diff --git a/examples/multimedia/multimedia.pro b/examples/multimedia/multimedia.pro
index 1f737a76c..cf631bb2c 100644
--- a/examples/multimedia/multimedia.pro
+++ b/examples/multimedia/multimedia.pro
@@ -8,10 +8,14 @@ SUBDIRS += \
 # These examples all need widgets for now (using creator templates that use widgets)
 qtHaveModule(widgets) {
     SUBDIRS += \
-        spectrum \
-        audiorecorder \
         audiodevices \
-        audiooutput
+        audiooutput \
+        audiorecorder \
+        camera \
+        player \
+        spectrum \
+        videographicsitem \
+        videowidget
 }
 
 qtHaveModule(quick) {
diff --git a/examples/multimediawidgets/player/CMakeLists.txt b/examples/multimedia/player/CMakeLists.txt
index 7c0304eaf..bd6631899 100644
--- a/examples/multimediawidgets/player/CMakeLists.txt
+++ b/examples/multimedia/player/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.16)
 project(player LANGUAGES CXX)
 
@@ -7,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/multimediawidgets/player")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/multimedia/player")
 
 find_package(Qt6 REQUIRED COMPONENTS MultimediaWidgets Network)
 
diff --git a/examples/multimediawidgets/player/doc/images/mediaplayerex.jpg b/examples/multimedia/player/doc/images/mediaplayerex.jpg
index e875bd134..e875bd134 100644
--- a/examples/multimediawidgets/player/doc/images/mediaplayerex.jpg
+++ b/examples/multimedia/player/doc/images/mediaplayerex.jpg
diff --git a/examples/multimediawidgets/player/doc/src/player.qdoc b/examples/multimedia/player/doc/src/player.qdoc
index d63b99ae3..d63b99ae3 100644
--- a/examples/multimediawidgets/player/doc/src/player.qdoc
+++ b/examples/multimedia/player/doc/src/player.qdoc
diff --git a/examples/multimediawidgets/player/main.cpp b/examples/multimedia/player/main.cpp
index befe1d561..befe1d561 100644
--- a/examples/multimediawidgets/player/main.cpp
+++ b/examples/multimedia/player/main.cpp
diff --git a/examples/multimediawidgets/player/player.cpp b/examples/multimedia/player/player.cpp
index 22146d7e9..22146d7e9 100644
--- a/examples/multimediawidgets/player/player.cpp
+++ b/examples/multimedia/player/player.cpp
diff --git a/examples/multimediawidgets/player/player.h b/examples/multimedia/player/player.h
index 1d328d307..1d328d307 100644
--- a/examples/multimediawidgets/player/player.h
+++ b/examples/multimedia/player/player.h
diff --git a/examples/multimediawidgets/player/player.pro b/examples/multimedia/player/player.pro
index 950fe8e0d..703942441 100644
--- a/examples/multimediawidgets/player/player.pro
+++ b/examples/multimedia/player/player.pro
@@ -23,5 +23,5 @@ SOURCES = main.cpp \
     qmediaplaylist.cpp \
     qplaylistfileparser.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/player
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/player
 INSTALLS += target
diff --git a/examples/multimediawidgets/player/playercontrols.cpp b/examples/multimedia/player/playercontrols.cpp
index 0a6827326..0a6827326 100644
--- a/examples/multimediawidgets/player/playercontrols.cpp
+++ b/examples/multimedia/player/playercontrols.cpp
diff --git a/examples/multimediawidgets/player/playercontrols.h b/examples/multimedia/player/playercontrols.h
index 72dddd68f..72dddd68f 100644
--- a/examples/multimediawidgets/player/playercontrols.h
+++ b/examples/multimedia/player/playercontrols.h
diff --git a/examples/multimediawidgets/player/playlistmodel.cpp b/examples/multimedia/player/playlistmodel.cpp
index 871aed0b8..871aed0b8 100644
--- a/examples/multimediawidgets/player/playlistmodel.cpp
+++ b/examples/multimedia/player/playlistmodel.cpp
diff --git a/examples/multimediawidgets/player/playlistmodel.h b/examples/multimedia/player/playlistmodel.h
index 6c20cc1d6..6c20cc1d6 100644
--- a/examples/multimediawidgets/player/playlistmodel.h
+++ b/examples/multimedia/player/playlistmodel.h
diff --git a/examples/multimediawidgets/player/qmediaplaylist.cpp b/examples/multimedia/player/qmediaplaylist.cpp
index 529720808..529720808 100644
--- a/examples/multimediawidgets/player/qmediaplaylist.cpp
+++ b/examples/multimedia/player/qmediaplaylist.cpp
diff --git a/examples/multimediawidgets/player/qmediaplaylist.h b/examples/multimedia/player/qmediaplaylist.h
index 94846d9b7..94846d9b7 100644
--- a/examples/multimediawidgets/player/qmediaplaylist.h
+++ b/examples/multimedia/player/qmediaplaylist.h
diff --git a/examples/multimediawidgets/player/qmediaplaylist_p.h b/examples/multimedia/player/qmediaplaylist_p.h
index b0a6609c7..b0a6609c7 100644
--- a/examples/multimediawidgets/player/qmediaplaylist_p.h
+++ b/examples/multimedia/player/qmediaplaylist_p.h
diff --git a/examples/multimediawidgets/player/qplaylistfileparser.cpp b/examples/multimedia/player/qplaylistfileparser.cpp
index 698f81ddc..698f81ddc 100644
--- a/examples/multimediawidgets/player/qplaylistfileparser.cpp
+++ b/examples/multimedia/player/qplaylistfileparser.cpp
diff --git a/examples/multimediawidgets/player/qplaylistfileparser_p.h b/examples/multimedia/player/qplaylistfileparser_p.h
index 3d2016736..3d2016736 100644
--- a/examples/multimediawidgets/player/qplaylistfileparser_p.h
+++ b/examples/multimedia/player/qplaylistfileparser_p.h
diff --git a/examples/multimediawidgets/player/videowidget.cpp b/examples/multimedia/player/videowidget.cpp
index e7f906e38..e7f906e38 100644
--- a/examples/multimediawidgets/player/videowidget.cpp
+++ b/examples/multimedia/player/videowidget.cpp
diff --git a/examples/multimediawidgets/player/videowidget.h b/examples/multimedia/player/videowidget.h
index 3505a3fb8..3505a3fb8 100644
--- a/examples/multimediawidgets/player/videowidget.h
+++ b/examples/multimedia/player/videowidget.h
diff --git a/examples/multimediawidgets/videographicsitem/CMakeLists.txt b/examples/multimedia/videographicsitem/CMakeLists.txt
index fb8f4d857..653627c25 100644
--- a/examples/multimediawidgets/videographicsitem/CMakeLists.txt
+++ b/examples/multimedia/videographicsitem/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.16)
 project(videographicsitem LANGUAGES CXX)
 
@@ -7,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/multimediawidgets/videographicsitem")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/multimedia/videographicsitem")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Multimedia MultimediaWidgets Widgets)
 
diff --git a/examples/multimediawidgets/videographicsitem/doc/images/video-videographicsitem.png b/examples/multimedia/videographicsitem/doc/images/video-videographicsitem.png
index e333c54a2..e333c54a2 100644
--- a/examples/multimediawidgets/videographicsitem/doc/images/video-videographicsitem.png
+++ b/examples/multimedia/videographicsitem/doc/images/video-videographicsitem.png
diff --git a/examples/multimediawidgets/videographicsitem/doc/src/videographicsitem.qdoc b/examples/multimedia/videographicsitem/doc/src/videographicsitem.qdoc
index 5dcb7143e..5dcb7143e 100644
--- a/examples/multimediawidgets/videographicsitem/doc/src/videographicsitem.qdoc
+++ b/examples/multimedia/videographicsitem/doc/src/videographicsitem.qdoc
diff --git a/examples/multimediawidgets/videographicsitem/main.cpp b/examples/multimedia/videographicsitem/main.cpp
index 85d1ec92b..85d1ec92b 100644
--- a/examples/multimediawidgets/videographicsitem/main.cpp
+++ b/examples/multimedia/videographicsitem/main.cpp
diff --git a/examples/multimediawidgets/videographicsitem/videographicsitem.pro b/examples/multimedia/videographicsitem/videographicsitem.pro
index 30a9b6f21..3415ef64c 100644
--- a/examples/multimediawidgets/videographicsitem/videographicsitem.pro
+++ b/examples/multimedia/videographicsitem/videographicsitem.pro
@@ -8,7 +8,7 @@ HEADERS   += videoplayer.h
 SOURCES   += main.cpp \
              videoplayer.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/videographicsitem
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/videographicsitem
 INSTALLS += target
 
 QT+=widgets
diff --git a/examples/multimediawidgets/videographicsitem/videoplayer.cpp b/examples/multimedia/videographicsitem/videoplayer.cpp
index 096fabd77..096fabd77 100644
--- a/examples/multimediawidgets/videographicsitem/videoplayer.cpp
+++ b/examples/multimedia/videographicsitem/videoplayer.cpp
diff --git a/examples/multimediawidgets/videographicsitem/videoplayer.h b/examples/multimedia/videographicsitem/videoplayer.h
index a5be31efc..a5be31efc 100644
--- a/examples/multimediawidgets/videographicsitem/videoplayer.h
+++ b/examples/multimedia/videographicsitem/videoplayer.h
diff --git a/examples/multimediawidgets/videowidget/CMakeLists.txt b/examples/multimedia/videowidget/CMakeLists.txt
index fbfaba50b..c33efeb0f 100644
--- a/examples/multimediawidgets/videowidget/CMakeLists.txt
+++ b/examples/multimedia/videowidget/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.16)
 project(videowidget LANGUAGES CXX)
 
@@ -7,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/multimediawidgets/videowidget")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/multimedia/videowidget")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Multimedia MultimediaWidgets Widgets)
 
diff --git a/examples/multimediawidgets/videowidget/doc/images/video-videowidget.png b/examples/multimedia/videowidget/doc/images/video-videowidget.png
index a3c7bcb44..a3c7bcb44 100644
--- a/examples/multimediawidgets/videowidget/doc/images/video-videowidget.png
+++ b/examples/multimedia/videowidget/doc/images/video-videowidget.png
diff --git a/examples/multimediawidgets/videowidget/doc/src/videowidget.qdoc b/examples/multimedia/videowidget/doc/src/videowidget.qdoc
index e999cc19c..e999cc19c 100644
--- a/examples/multimediawidgets/videowidget/doc/src/videowidget.qdoc
+++ b/examples/multimedia/videowidget/doc/src/videowidget.qdoc
diff --git a/examples/multimediawidgets/videowidget/main.cpp b/examples/multimedia/videowidget/main.cpp
index ccf5983dd..ccf5983dd 100644
--- a/examples/multimediawidgets/videowidget/main.cpp
+++ b/examples/multimedia/videowidget/main.cpp
diff --git a/examples/multimediawidgets/videowidget/videoplayer.cpp b/examples/multimedia/videowidget/videoplayer.cpp
index 4a34bfded..4a34bfded 100644
--- a/examples/multimediawidgets/videowidget/videoplayer.cpp
+++ b/examples/multimedia/videowidget/videoplayer.cpp
diff --git a/examples/multimediawidgets/videowidget/videoplayer.h b/examples/multimedia/videowidget/videoplayer.h
index b06df8280..b06df8280 100644
--- a/examples/multimediawidgets/videowidget/videoplayer.h
+++ b/examples/multimedia/videowidget/videoplayer.h
diff --git a/examples/multimediawidgets/videowidget/videowidget.pro b/examples/multimedia/videowidget/videowidget.pro
index 603996b2e..56312a028 100644
--- a/examples/multimediawidgets/videowidget/videowidget.pro
+++ b/examples/multimedia/videowidget/videowidget.pro
@@ -10,7 +10,7 @@ SOURCES = \
     main.cpp \
     videoplayer.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/videowidget
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/videowidget
 INSTALLS += target
 
 QT+=widgets
diff --git a/examples/multimediawidgets/CMakeLists.txt b/examples/multimediawidgets/CMakeLists.txt
deleted file mode 100644
index 8d16458c2..000000000
--- a/examples/multimediawidgets/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-if(TARGET Qt::Widgets)
-    qt_internal_add_example(camera)
-    qt_internal_add_example(videographicsitem)
-    qt_internal_add_example(videowidget)
-    qt_internal_add_example(player)
-endif()
diff --git a/examples/multimediawidgets/multimediawidgets.pro b/examples/multimediawidgets/multimediawidgets.pro
deleted file mode 100644
index aa74b00f0..000000000
--- a/examples/multimediawidgets/multimediawidgets.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = subdirs
-
-# These examples all need widgets for now (using creator templates that use widgets)
-qtHaveModule(widgets) {
-    SUBDIRS += \
-        camera \
-        videographicsitem \
-        videowidget \
-        player
-}
diff --git a/src/multimedia/doc/qtmultimedia.qdocconf b/src/multimedia/doc/qtmultimedia.qdocconf
index ba1ea34c6..d1e59d4a7 100644
--- a/src/multimedia/doc/qtmultimedia.qdocconf
+++ b/src/multimedia/doc/qtmultimedia.qdocconf
@@ -9,6 +9,8 @@ version                 = $QT_VERSION
 moduleheader            = QtMultimedia
 includepaths           += .
 
+examplesinstallpath     = multimedia
+
 # The following parameters are for creating a qhp file, the qhelpgenerator
 # program can convert the qhp file into a qch file which can be opened in
 # Qt Assistant and/or Qt Creator.