diff --git a/demos/demos.pro b/demos/demos.pro
deleted file mode 100644
index 4cbc676e..00000000
--- a/demos/demos.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS +=  spectrum
diff --git a/examples/multimedia/README b/examples/multimedia/README
index aa78e369..6b777b44 100644
--- a/examples/multimedia/README
+++ b/examples/multimedia/README
@@ -2,33 +2,6 @@
 The example launcher provided with Qt can be used to explore each of the
 examples in this directory.
 
+
 Documentation for these examples can be found via the Tutorial and Examples
 link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/demos/spectrum/3rdparty/fftreal/Array.h b/examples/multimedia/spectrum/3rdparty/fftreal/Array.h
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/Array.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/Array.h
diff --git a/demos/spectrum/3rdparty/fftreal/Array.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/Array.hpp
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/Array.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/Array.hpp
diff --git a/demos/spectrum/3rdparty/fftreal/DynArray.h b/examples/multimedia/spectrum/3rdparty/fftreal/DynArray.h
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/DynArray.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/DynArray.h
diff --git a/demos/spectrum/3rdparty/fftreal/DynArray.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/DynArray.hpp
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/DynArray.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/DynArray.hpp
diff --git a/demos/spectrum/3rdparty/fftreal/FFTReal.dsp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.dsp
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/FFTReal.dsp
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.dsp
diff --git a/demos/spectrum/3rdparty/fftreal/FFTReal.dsw b/examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.dsw
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/FFTReal.dsw
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.dsw
diff --git a/demos/spectrum/3rdparty/fftreal/FFTReal.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.h
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/FFTReal.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.h
diff --git a/demos/spectrum/3rdparty/fftreal/FFTReal.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.hpp
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/FFTReal.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.hpp
diff --git a/demos/spectrum/3rdparty/fftreal/FFTRealFixLen.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealFixLen.h
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/FFTRealFixLen.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealFixLen.h
diff --git a/demos/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp
diff --git a/demos/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h
diff --git a/demos/spectrum/3rdparty/fftreal/FFTRealPassDirect.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassDirect.h
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/FFTRealPassDirect.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassDirect.h
diff --git a/demos/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp
diff --git a/demos/spectrum/3rdparty/fftreal/FFTRealPassInverse.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassInverse.h
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/FFTRealPassInverse.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassInverse.h
diff --git a/demos/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp
diff --git a/demos/spectrum/3rdparty/fftreal/FFTRealSelect.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealSelect.h
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/FFTRealSelect.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealSelect.h
diff --git a/demos/spectrum/3rdparty/fftreal/FFTRealSelect.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealSelect.hpp
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/FFTRealSelect.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealSelect.hpp
diff --git a/demos/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h
diff --git a/demos/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp
diff --git a/demos/spectrum/3rdparty/fftreal/OscSinCos.h b/examples/multimedia/spectrum/3rdparty/fftreal/OscSinCos.h
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/OscSinCos.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/OscSinCos.h
diff --git a/demos/spectrum/3rdparty/fftreal/OscSinCos.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/OscSinCos.hpp
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/OscSinCos.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/OscSinCos.hpp
diff --git a/demos/spectrum/3rdparty/fftreal/TestAccuracy.h b/examples/multimedia/spectrum/3rdparty/fftreal/TestAccuracy.h
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/TestAccuracy.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/TestAccuracy.h
diff --git a/demos/spectrum/3rdparty/fftreal/TestAccuracy.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/TestAccuracy.hpp
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/TestAccuracy.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/TestAccuracy.hpp
diff --git a/demos/spectrum/3rdparty/fftreal/TestHelperFixLen.h b/examples/multimedia/spectrum/3rdparty/fftreal/TestHelperFixLen.h
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/TestHelperFixLen.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/TestHelperFixLen.h
diff --git a/demos/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp
diff --git a/demos/spectrum/3rdparty/fftreal/TestHelperNormal.h b/examples/multimedia/spectrum/3rdparty/fftreal/TestHelperNormal.h
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/TestHelperNormal.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/TestHelperNormal.h
diff --git a/demos/spectrum/3rdparty/fftreal/TestHelperNormal.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/TestHelperNormal.hpp
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/TestHelperNormal.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/TestHelperNormal.hpp
diff --git a/demos/spectrum/3rdparty/fftreal/TestSpeed.h b/examples/multimedia/spectrum/3rdparty/fftreal/TestSpeed.h
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/TestSpeed.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/TestSpeed.h
diff --git a/demos/spectrum/3rdparty/fftreal/TestSpeed.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/TestSpeed.hpp
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/TestSpeed.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/TestSpeed.hpp
diff --git a/demos/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h b/examples/multimedia/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h
diff --git a/demos/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp
diff --git a/demos/spectrum/3rdparty/fftreal/bwins/fftrealu.def b/examples/multimedia/spectrum/3rdparty/fftreal/bwins/fftrealu.def
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/bwins/fftrealu.def
rename to examples/multimedia/spectrum/3rdparty/fftreal/bwins/fftrealu.def
diff --git a/demos/spectrum/3rdparty/fftreal/def.h b/examples/multimedia/spectrum/3rdparty/fftreal/def.h
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/def.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/def.h
diff --git a/demos/spectrum/3rdparty/fftreal/eabi/fftrealu.def b/examples/multimedia/spectrum/3rdparty/fftreal/eabi/fftrealu.def
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/eabi/fftrealu.def
rename to examples/multimedia/spectrum/3rdparty/fftreal/eabi/fftrealu.def
diff --git a/demos/spectrum/3rdparty/fftreal/fftreal.pas b/examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pas
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/fftreal.pas
rename to examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pas
diff --git a/demos/spectrum/3rdparty/fftreal/fftreal.pro b/examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pro
similarity index 93%
rename from demos/spectrum/3rdparty/fftreal/fftreal.pro
rename to examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pro
index aa61b3a6..fdf4a42e 100644
--- a/demos/spectrum/3rdparty/fftreal/fftreal.pro
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pro
@@ -47,6 +47,6 @@ macx {
 
 sources.files = $$SOURCES $$HEADERS fftreal.pro readme.txt license.txt
 sources.files += bwins/fftreal.def eabi/fftreal.def
-sources.path = $$[QT_INSTALL_DEMOS]/qtmultimedia/spectrum/3rdparty/fftreal
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/multimedia/spectrum/3rdparty/fftreal
 INSTALLS += sources
 
diff --git a/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp b/examples/multimedia/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
diff --git a/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h b/examples/multimedia/spectrum/3rdparty/fftreal/fftreal_wrapper.h
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/fftreal_wrapper.h
diff --git a/demos/spectrum/3rdparty/fftreal/license.txt b/examples/multimedia/spectrum/3rdparty/fftreal/license.txt
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/license.txt
rename to examples/multimedia/spectrum/3rdparty/fftreal/license.txt
diff --git a/demos/spectrum/3rdparty/fftreal/readme.txt b/examples/multimedia/spectrum/3rdparty/fftreal/readme.txt
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/readme.txt
rename to examples/multimedia/spectrum/3rdparty/fftreal/readme.txt
diff --git a/demos/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp
diff --git a/demos/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.h b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.h
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.h
diff --git a/demos/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.hpp
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.hpp
diff --git a/demos/spectrum/3rdparty/fftreal/stopwatch/Int64.h b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/Int64.h
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/stopwatch/Int64.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/Int64.h
diff --git a/demos/spectrum/3rdparty/fftreal/stopwatch/StopWatch.cpp b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/StopWatch.cpp
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/stopwatch/StopWatch.cpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/StopWatch.cpp
diff --git a/demos/spectrum/3rdparty/fftreal/stopwatch/StopWatch.h b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/StopWatch.h
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/stopwatch/StopWatch.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/StopWatch.h
diff --git a/demos/spectrum/3rdparty/fftreal/stopwatch/StopWatch.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/StopWatch.hpp
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/stopwatch/StopWatch.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/StopWatch.hpp
diff --git a/demos/spectrum/3rdparty/fftreal/stopwatch/def.h b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/def.h
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/stopwatch/def.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/def.h
diff --git a/demos/spectrum/3rdparty/fftreal/stopwatch/fnc.h b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/fnc.h
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/stopwatch/fnc.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/fnc.h
diff --git a/demos/spectrum/3rdparty/fftreal/stopwatch/fnc.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/fnc.hpp
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/stopwatch/fnc.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/fnc.hpp
diff --git a/demos/spectrum/3rdparty/fftreal/test.cpp b/examples/multimedia/spectrum/3rdparty/fftreal/test.cpp
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/test.cpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/test.cpp
diff --git a/demos/spectrum/3rdparty/fftreal/test_fnc.h b/examples/multimedia/spectrum/3rdparty/fftreal/test_fnc.h
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/test_fnc.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/test_fnc.h
diff --git a/demos/spectrum/3rdparty/fftreal/test_fnc.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/test_fnc.hpp
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/test_fnc.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/test_fnc.hpp
diff --git a/demos/spectrum/3rdparty/fftreal/test_settings.h b/examples/multimedia/spectrum/3rdparty/fftreal/test_settings.h
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/test_settings.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/test_settings.h
diff --git a/demos/spectrum/3rdparty/fftreal/testapp.dpr b/examples/multimedia/spectrum/3rdparty/fftreal/testapp.dpr
similarity index 100%
rename from demos/spectrum/3rdparty/fftreal/testapp.dpr
rename to examples/multimedia/spectrum/3rdparty/fftreal/testapp.dpr
diff --git a/demos/spectrum/README.txt b/examples/multimedia/spectrum/README.txt
similarity index 94%
rename from demos/spectrum/README.txt
rename to examples/multimedia/spectrum/README.txt
index c39d4a70..09f76fa2 100644
--- a/demos/spectrum/README.txt
+++ b/examples/multimedia/spectrum/README.txt
@@ -1,10 +1,10 @@
-Spectrum analyser demo app
+Spectrum analyser app
 ==========================
 
 Introduction
 ------------
 
-This application is a demo which uses the QtMultimedia APIs to capture and play back PCM audio.  While either recording or playback is ongoing, the application performs real-time level and frequency spectrum analysis, displaying the results in its main window.
+This application is an example which uses the QtMultimedia APIs to capture and play back PCM audio.  While either recording or playback is ongoing, the application performs real-time level and frequency spectrum analysis, displaying the results in its main window.
 
 
 Acknowledgments
diff --git a/demos/spectrum/TODO.txt b/examples/multimedia/spectrum/TODO.txt
similarity index 100%
rename from demos/spectrum/TODO.txt
rename to examples/multimedia/spectrum/TODO.txt
diff --git a/demos/spectrum/app/.gitignore b/examples/multimedia/spectrum/app/.gitignore
similarity index 100%
rename from demos/spectrum/app/.gitignore
rename to examples/multimedia/spectrum/app/.gitignore
diff --git a/demos/spectrum/app/app.pro b/examples/multimedia/spectrum/app/app.pro
similarity index 95%
rename from demos/spectrum/app/app.pro
rename to examples/multimedia/spectrum/app/app.pro
index 38242967..71ffc42d 100644
--- a/demos/spectrum/app/app.pro
+++ b/examples/multimedia/spectrum/app/app.pro
@@ -74,9 +74,9 @@ symbian {
 # Install
 
 sources.files = $$SOURCES $$HEADERS $$RESOURCES app.pro
-sources.path = $$[QT_INSTALL_DEMOS]/qtmultimedia/spectrum/app
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/multimedia/spectrum/app
 images.files += images/record.png images/settings.png
-images.path = $$[QT_INSTALL_DEMOS]/qtmultimedia/spectrum/app/images
+images.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/multimedia/spectrum/app/images
 INSTALLS += sources images
 
 # Deployment
diff --git a/demos/spectrum/app/engine.cpp b/examples/multimedia/spectrum/app/engine.cpp
similarity index 100%
rename from demos/spectrum/app/engine.cpp
rename to examples/multimedia/spectrum/app/engine.cpp
diff --git a/demos/spectrum/app/engine.h b/examples/multimedia/spectrum/app/engine.h
similarity index 100%
rename from demos/spectrum/app/engine.h
rename to examples/multimedia/spectrum/app/engine.h
diff --git a/demos/spectrum/app/frequencyspectrum.cpp b/examples/multimedia/spectrum/app/frequencyspectrum.cpp
similarity index 100%
rename from demos/spectrum/app/frequencyspectrum.cpp
rename to examples/multimedia/spectrum/app/frequencyspectrum.cpp
diff --git a/demos/spectrum/app/frequencyspectrum.h b/examples/multimedia/spectrum/app/frequencyspectrum.h
similarity index 100%
rename from demos/spectrum/app/frequencyspectrum.h
rename to examples/multimedia/spectrum/app/frequencyspectrum.h
diff --git a/demos/spectrum/app/images/record.png b/examples/multimedia/spectrum/app/images/record.png
similarity index 100%
rename from demos/spectrum/app/images/record.png
rename to examples/multimedia/spectrum/app/images/record.png
diff --git a/demos/spectrum/app/images/settings.png b/examples/multimedia/spectrum/app/images/settings.png
similarity index 100%
rename from demos/spectrum/app/images/settings.png
rename to examples/multimedia/spectrum/app/images/settings.png
diff --git a/demos/spectrum/app/levelmeter.cpp b/examples/multimedia/spectrum/app/levelmeter.cpp
similarity index 100%
rename from demos/spectrum/app/levelmeter.cpp
rename to examples/multimedia/spectrum/app/levelmeter.cpp
diff --git a/demos/spectrum/app/levelmeter.h b/examples/multimedia/spectrum/app/levelmeter.h
similarity index 100%
rename from demos/spectrum/app/levelmeter.h
rename to examples/multimedia/spectrum/app/levelmeter.h
diff --git a/demos/spectrum/app/main.cpp b/examples/multimedia/spectrum/app/main.cpp
similarity index 100%
rename from demos/spectrum/app/main.cpp
rename to examples/multimedia/spectrum/app/main.cpp
diff --git a/demos/spectrum/app/mainwidget.cpp b/examples/multimedia/spectrum/app/mainwidget.cpp
similarity index 100%
rename from demos/spectrum/app/mainwidget.cpp
rename to examples/multimedia/spectrum/app/mainwidget.cpp
diff --git a/demos/spectrum/app/mainwidget.h b/examples/multimedia/spectrum/app/mainwidget.h
similarity index 100%
rename from demos/spectrum/app/mainwidget.h
rename to examples/multimedia/spectrum/app/mainwidget.h
diff --git a/demos/spectrum/app/progressbar.cpp b/examples/multimedia/spectrum/app/progressbar.cpp
similarity index 100%
rename from demos/spectrum/app/progressbar.cpp
rename to examples/multimedia/spectrum/app/progressbar.cpp
diff --git a/demos/spectrum/app/progressbar.h b/examples/multimedia/spectrum/app/progressbar.h
similarity index 100%
rename from demos/spectrum/app/progressbar.h
rename to examples/multimedia/spectrum/app/progressbar.h
diff --git a/demos/spectrum/app/settingsdialog.cpp b/examples/multimedia/spectrum/app/settingsdialog.cpp
similarity index 100%
rename from demos/spectrum/app/settingsdialog.cpp
rename to examples/multimedia/spectrum/app/settingsdialog.cpp
diff --git a/demos/spectrum/app/settingsdialog.h b/examples/multimedia/spectrum/app/settingsdialog.h
similarity index 100%
rename from demos/spectrum/app/settingsdialog.h
rename to examples/multimedia/spectrum/app/settingsdialog.h
diff --git a/demos/spectrum/app/spectrograph.cpp b/examples/multimedia/spectrum/app/spectrograph.cpp
similarity index 100%
rename from demos/spectrum/app/spectrograph.cpp
rename to examples/multimedia/spectrum/app/spectrograph.cpp
diff --git a/demos/spectrum/app/spectrograph.h b/examples/multimedia/spectrum/app/spectrograph.h
similarity index 100%
rename from demos/spectrum/app/spectrograph.h
rename to examples/multimedia/spectrum/app/spectrograph.h
diff --git a/demos/spectrum/app/spectrum.h b/examples/multimedia/spectrum/app/spectrum.h
similarity index 100%
rename from demos/spectrum/app/spectrum.h
rename to examples/multimedia/spectrum/app/spectrum.h
diff --git a/demos/spectrum/app/spectrum.qrc b/examples/multimedia/spectrum/app/spectrum.qrc
similarity index 100%
rename from demos/spectrum/app/spectrum.qrc
rename to examples/multimedia/spectrum/app/spectrum.qrc
diff --git a/demos/spectrum/app/spectrumanalyser.cpp b/examples/multimedia/spectrum/app/spectrumanalyser.cpp
similarity index 100%
rename from demos/spectrum/app/spectrumanalyser.cpp
rename to examples/multimedia/spectrum/app/spectrumanalyser.cpp
diff --git a/demos/spectrum/app/spectrumanalyser.h b/examples/multimedia/spectrum/app/spectrumanalyser.h
similarity index 100%
rename from demos/spectrum/app/spectrumanalyser.h
rename to examples/multimedia/spectrum/app/spectrumanalyser.h
diff --git a/demos/spectrum/app/tonegenerator.cpp b/examples/multimedia/spectrum/app/tonegenerator.cpp
similarity index 100%
rename from demos/spectrum/app/tonegenerator.cpp
rename to examples/multimedia/spectrum/app/tonegenerator.cpp
diff --git a/demos/spectrum/app/tonegenerator.h b/examples/multimedia/spectrum/app/tonegenerator.h
similarity index 100%
rename from demos/spectrum/app/tonegenerator.h
rename to examples/multimedia/spectrum/app/tonegenerator.h
diff --git a/demos/spectrum/app/tonegeneratordialog.cpp b/examples/multimedia/spectrum/app/tonegeneratordialog.cpp
similarity index 100%
rename from demos/spectrum/app/tonegeneratordialog.cpp
rename to examples/multimedia/spectrum/app/tonegeneratordialog.cpp
diff --git a/demos/spectrum/app/tonegeneratordialog.h b/examples/multimedia/spectrum/app/tonegeneratordialog.h
similarity index 100%
rename from demos/spectrum/app/tonegeneratordialog.h
rename to examples/multimedia/spectrum/app/tonegeneratordialog.h
diff --git a/demos/spectrum/app/utils.cpp b/examples/multimedia/spectrum/app/utils.cpp
similarity index 100%
rename from demos/spectrum/app/utils.cpp
rename to examples/multimedia/spectrum/app/utils.cpp
diff --git a/demos/spectrum/app/utils.h b/examples/multimedia/spectrum/app/utils.h
similarity index 100%
rename from demos/spectrum/app/utils.h
rename to examples/multimedia/spectrum/app/utils.h
diff --git a/demos/spectrum/app/waveform.cpp b/examples/multimedia/spectrum/app/waveform.cpp
similarity index 100%
rename from demos/spectrum/app/waveform.cpp
rename to examples/multimedia/spectrum/app/waveform.cpp
diff --git a/demos/spectrum/app/waveform.h b/examples/multimedia/spectrum/app/waveform.h
similarity index 100%
rename from demos/spectrum/app/waveform.h
rename to examples/multimedia/spectrum/app/waveform.h
diff --git a/demos/spectrum/app/wavfile.cpp b/examples/multimedia/spectrum/app/wavfile.cpp
similarity index 100%
rename from demos/spectrum/app/wavfile.cpp
rename to examples/multimedia/spectrum/app/wavfile.cpp
diff --git a/demos/spectrum/app/wavfile.h b/examples/multimedia/spectrum/app/wavfile.h
similarity index 100%
rename from demos/spectrum/app/wavfile.h
rename to examples/multimedia/spectrum/app/wavfile.h
diff --git a/demos/spectrum/spectrum.pri b/examples/multimedia/spectrum/spectrum.pri
similarity index 100%
rename from demos/spectrum/spectrum.pri
rename to examples/multimedia/spectrum/spectrum.pri
diff --git a/demos/spectrum/spectrum.pro b/examples/multimedia/spectrum/spectrum.pro
similarity index 81%
rename from demos/spectrum/spectrum.pro
rename to examples/multimedia/spectrum/spectrum.pro
index cfb35f1b..09de8b27 100644
--- a/demos/spectrum/spectrum.pro
+++ b/examples/multimedia/spectrum/spectrum.pro
@@ -16,13 +16,13 @@ TARGET = spectrum
 symbian {
     # Create a 'make sis' rule which can be run from the top-level
 
-    CONFIG += qt_demo
+    CONFIG += qt_example
 
     # UID for the SIS file
     TARGET.UID3 = 0xA000E402
 }
 
 sources.files = README.txt spectrum.pri spectrum.pro TODO.txt
-sources.path = $$[QT_INSTALL_DEMOS]/qtmultimedia/spectrum
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/multimedia/spectrum
 INSTALLS += sources
 
diff --git a/qtmultimedia.pro b/qtmultimedia.pro
index 00cd6bd5..45af204f 100644
--- a/qtmultimedia.pro
+++ b/qtmultimedia.pro
@@ -3,14 +3,6 @@ TEMPLATE = subdirs
 module_qtmultimedia_src.subdir = src
 module_qtmultimedia_src.target = module-qtmultimedia-src
 
-module_qtmultimedia_demos.subdir = demos
-module_qtmultimedia_demos.target = module-qtmultimedia-demos
-module_qtmultimedia_demos.depends = module_qtmultimedia_src
-!contains(QT_BUILD_PARTS,demos) {
-    module_multimedia_demos.CONFIG += no_default_install no_default_target
-}
-
-
 module_qtmultimedia_examples.subdir = examples
 module_qtmultimedia_examples.target = module-qtmultimedia-examples
 module_qtmultimedia_examples.depends = module_qtmultimedia_src
@@ -26,6 +18,5 @@ module_qtmultimedia_tests.CONFIG = no_default_install
 !contains(QT_BUILD_PARTS,tests):module_qtmultimedia_tests.CONFIG += no_default_target
 
 SUBDIRS += module_qtmultimedia_src \
-           module_qtmultimedia_demos \
            module_qtmultimedia_examples \
            module_qtmultimedia_tests \