104 files changed, 278 insertions, 288 deletions

diff --git a/demos/demos.pro b/demos/demos.pro
deleted file mode 100644
index 3053804..0000000
--- a/demos/demos.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS +=  embedded
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.pro b/demos/embedded/fluidlauncher/fluidlauncher.pro
deleted file mode 100644
index 9341496..0000000
--- a/demos/embedded/fluidlauncher/fluidlauncher.pro
+++ /dev/null
@@ -1,263 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-VERSION = $$QT_VERSION
-
-# Input
-HEADERS += \
-           demoapplication.h \
-           fluidlauncher.h \
-           pictureflow.h \
-           slideshow.h
-
-SOURCES += \
-           demoapplication.cpp \
-           fluidlauncher.cpp \
-           main.cpp \
-           pictureflow.cpp \
-           slideshow.cpp
-
-embedded{
-    target.path = $$[QT_INSTALL_DEMOS]/qtsvg/embedded/fluidlauncher
-    sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html config.xml screenshots slides
-    sources.path = $$[QT_INSTALL_DEMOS]/qtsvg/embedded/fluidlauncher
-    INSTALLS += target sources
-}
-
-wince*{
-    QT += svg
-
-    BUILD_DIR = release
-    if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
-        BUILD_DIR = debug
-    }
-
-    executables.files = \
-        $$QT_BUILD_TREE/demos/embedded/embeddedsvgviewer/$${BUILD_DIR}/embeddedsvgviewer.exe \
-        $$QT_BUILD_TREE/demos/embedded/styledemo/$${BUILD_DIR}/styledemo.exe \
-        $$QT_BUILD_TREE/demos/deform/$${BUILD_DIR}/deform.exe \
-        $$QT_BUILD_TREE/demos/pathstroke/$${BUILD_DIR}/pathstroke.exe \
-        $$QT_BUILD_TREE/examples/graphicsview/elasticnodes/$${BUILD_DIR}/elasticnodes.exe \
-        $$QT_BUILD_TREE/examples/widgets/wiggly/$${BUILD_DIR}/wiggly.exe \
-        $$QT_BUILD_TREE/examples/painting/concentriccircles/$${BUILD_DIR}/concentriccircles.exe \
-        $$QT_BUILD_TREE/examples/draganddrop/$${BUILD_DIR}/fridgemagnets.exe
-
-    executables.path = .
-
-    files.files = $$PWD/screenshots $$PWD/slides $$PWD/../embeddedsvgviewer/shapes.svg
-    files.path = .
-
-    config.files = $$PWD/config_wince/config.xml
-    config.path = .
-
-    DEPLOYMENT += config files executables
-
-    DEPLOYMENT_PLUGIN += qgif qjpeg qmng qsvg
-}
-
-symbian {
-    load(data_caging_paths)
-    CONFIG += qt_demo
-    RSS_RULES = # Clear RSS_RULES, otherwise fluidlauncher will get put into QtDemos folder
-
-    TARGET.UID3 = 0xA000A641
-
-    defineReplace(regResourceDir) {
-        symbian-abld|symbian-sbsv2 {
-            return($${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/$$basename(1))
-        } else {
-            return($${QT_BUILD_TREE}/$$1)
-        }
-    }
-
-    defineReplace(appResourceDir) {
-        symbian-abld|symbian-sbsv2 {
-            return($${EPOCROOT}$${HW_ZDIR}$${APP_RESOURCE_DIR}/$$basename(1))
-        } else {
-            return($${QT_BUILD_TREE}/$$1)
-        }
-    }
-
-    executables.files = \
-        $$QT_BUILD_TREE/demos/embedded/styledemo/styledemo.exe \
-        $$QT_BUILD_TREE/demos/deform/deform.exe \
-        $$QT_BUILD_TREE/demos/pathstroke/pathstroke.exe \
-        $$QT_BUILD_TREE/examples/widgets/wiggly/wiggly.exe \
-        $$QT_BUILD_TREE/examples/network/qftp/qftp.exe \
-        $$QT_BUILD_TREE/examples/xml/saxbookmarks/saxbookmarks.exe \
-        $$QT_BUILD_TREE/demos/embedded/desktopservices/desktopservices.exe \
-        $$QT_BUILD_TREE/examples/draganddrop/fridgemagnets/fridgemagnets.exe \
-        $$QT_BUILD_TREE/examples/widgets/softkeys/softkeys.exe \
-        $$QT_BUILD_TREE/demos/embedded/raycasting/raycasting.exe \
-        $$QT_BUILD_TREE/demos/embedded/flickable/flickable.exe \
-        $$QT_BUILD_TREE/demos/embedded/digiflip/digiflip.exe \
-        $$QT_BUILD_TREE/demos/embedded/lightmaps/lightmaps.exe \
-        $$QT_BUILD_TREE/demos/embedded/flightinfo/flightinfo.exe
-
-    executables.path = /sys/bin
-
-    reg_resource.files = \
-        $$regResourceDir(demos/embedded/styledemo/styledemo_reg.rsc) \
-        $$regResourceDir(demos/deform/deform_reg.rsc) \
-        $$regResourceDir(demos/pathstroke/pathstroke_reg.rsc) \
-        $$regResourceDir(examples/widgets/wiggly/wiggly_reg.rsc) \
-        $$regResourceDir(examples/network/qftp/qftp_reg.rsc)\
-        $$regResourceDir(examples/xml/saxbookmarks/saxbookmarks_reg.rsc) \
-        $$regResourceDir(demos/embedded/desktopservices/desktopservices_reg.rsc) \
-        $$regResourceDir(examples/draganddrop/fridgemagnets/fridgemagnets_reg.rsc) \
-        $$regResourceDir(examples/widgets/softkeys/softkeys_reg.rsc) \
-        $$regResourceDir(demos/embedded/raycasting/raycasting_reg.rsc) \
-        $$regResourceDir(demos/embedded/flickable/flickable_reg.rsc) \
-        $$regResourceDir(demos/embedded/digiflip/digiflip_reg.rsc) \
-        $$regResourceDir(demos/embedded/lightmaps/lightmaps_reg.rsc) \
-        $$regResourceDir(demos/embedded/flightinfo/flightinfo_reg.rsc)
-
-    contains(QT_CONFIG, phonon) {
-        reg_resource.files += $$regResourceDir(demos/qmediaplayer/qmediaplayer_reg.rsc)
-    }
-
-    contains(QT_CONFIG, multimedia) {
-        reg_resource.files += $$regResourceDir(demos/spectrum/app/spectrum_reg.rsc)
-    }
-
-
-    reg_resource.path = $$REG_RESOURCE_IMPORT_DIR
-
-    resource.files = \
-        $$appResourceDir(demos/embedded/styledemo/styledemo.rsc) \
-        $$appResourceDir(demos/deform/deform.rsc) \
-        $$appResourceDir(demos/pathstroke/pathstroke.rsc) \
-        $$appResourceDir(examples/widgets/wiggly/wiggly.rsc) \
-        $$appResourceDir(examples/network/qftp/qftp.rsc)\
-        $$appResourceDir(examples/xml/saxbookmarks/saxbookmarks.rsc) \
-        $$appResourceDir(demos/embedded/desktopservices/desktopservices.rsc) \
-        $$appResourceDir(examples/draganddrop/fridgemagnets/fridgemagnets.rsc) \
-        $$appResourceDir(examples/widgets/softkeys/softkeys.rsc) \
-        $$appResourceDir(demos/embedded/raycasting/raycasting.rsc) \
-        $$appResourceDir(demos/embedded/flickable/flickable.rsc) \
-        $$appResourceDir(demos/embedded/digiflip/digiflip.rsc) \
-        $$appResourceDir(demos/embedded/lightmaps/lightmaps.rsc) \
-        $$appResourceDir(demos/embedded/flightinfo/flightinfo.rsc)
-
-
-    resource.path = $$APP_RESOURCE_DIR
-
-    mifs.files = \
-        $$appResourceDir(demos/embedded/fluidlauncher/fluidlauncher.mif) \
-        $$appResourceDir(demos/embedded/styledemo/styledemo.mif) \
-        $$appResourceDir(demos/deform/deform.mif) \
-        $$appResourceDir(demos/pathstroke/pathstroke.mif) \
-        $$appResourceDir(examples/widgets/wiggly/wiggly.mif) \
-        $$appResourceDir(examples/network/qftp/qftp.mif) \
-        $$appResourceDir(examples/xml/saxbookmarks/saxbookmarks.mif) \
-        $$appResourceDir(demos/embedded/desktopservices/desktopservices.mif) \
-        $$appResourceDir(examples/draganddrop/fridgemagnets/fridgemagnets.mif) \
-        $$appResourceDir(examples/widgets/softkeys/softkeys.mif) \
-        $$appResourceDir(demos/embedded/raycasting/raycasting.mif) \
-        $$appResourceDir(demos/embedded/flickable/flickable.mif) \
-        $$appResourceDir(demos/embedded/digiflip/digiflip.mif) \
-        $$appResourceDir(demos/embedded/lightmaps/lightmaps.mif) \
-        $$appResourceDir(demos/embedded/flightinfo/flightinfo.mif)
-    mifs.path = $$APP_RESOURCE_DIR
-
-    contains(QT_CONFIG, svg) {
-        executables.files += \
-            $$QT_BUILD_TREE/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.exe \
-            $$QT_BUILD_TREE/demos/embedded/weatherinfo/weatherinfo.exe
-
-        reg_resource.files += \
-            $$regResourceDir(demos/embedded/embeddedsvgviewer/embeddedsvgviewer_reg.rsc) \
-            $$regResourceDir(demos/embedded/weatherinfo/weatherinfo_reg.rsc)
-
-        resource.files += \
-            $$appResourceDir(demos/embedded/embeddedsvgviewer/embeddedsvgviewer.rsc) \
-            $$appResourceDir(demos/embedded/weatherinfo/weatherinfo.rsc)
-
-        mifs.files += \
-            $$appResourceDir(demos/embedded/embeddedsvgviewer/embeddedsvgviewer.mif) \
-            $$appResourceDir(demos/embedded/weatherinfo/weatherinfo.mif)
-
-    }
-    contains(QT_CONFIG, webkit) {
-        executables.files += $$QT_BUILD_TREE/demos/embedded/anomaly/anomaly.exe
-        reg_resource.files += $$regResourceDir(demos/embedded/anomaly/anomaly_reg.rsc)
-        resource.files += $$appResourceDir(demos/embedded/anomaly/anomaly.rsc)
-        mifs.files += \
-            $$appResourceDir(demos/embedded/anomaly/anomaly.mif)
-
-        isEmpty(QT_LIBINFIX) {
-            # Since Fluidlauncher itself doesn't link webkit, we won't get dependency automatically
-            executables.pkg_prerules += \
-                "; Dependency to Qt Webkit" \
-                "(0x200267C2), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION},  {\"QtWebKit\"}"
-        }
-    }
-
-    contains(QT_CONFIG, phonon) {
-        executables.files += $$QT_BUILD_TREE/demos/qmediaplayer/qmediaplayer.exe
-        resource.files += $$appResourceDir(demos/qmediaplayer/qmediaplayer.rsc)
-        mifs.files += \
-            $$appResourceDir(demos/qmediaplayer/qmediaplayer.mif)
-    }
-
-    contains(QT_CONFIG, multimedia) {
-        executables.files += $$QT_BUILD_TREE/demos/spectrum/app/spectrum.exe
-        executables.files += $$QT_BUILD_TREE/demos/spectrum/3rdparty/fftreal/fftreal.dll
-        resource.files += $$appResourceDir(demos/spectrum/app/spectrum.rsc)
-        mifs.files += \
-            $$appResourceDir(demos/spectrum/app/spectrum.mif)
-    }
-
-    contains(QT_CONFIG, script) {
-        executables.files += $$QT_BUILD_TREE/examples/script/context2d/context2d.exe
-        reg_resource.files += $$regResourceDir(examples/script/context2d/context2d_reg.rsc)
-        resource.files += $$appResourceDir(examples/script/context2d/context2d.rsc)
-        mifs.files += \
-            $$appResourceDir(examples/script/context2d/context2d.mif)
-    }
-
-    qmldemos = qmlcalculator qmlclocks qmldialcontrol qmleasing qmlflickr qmlphotoviewer qmltwitter
-    contains(QT_CONFIG, declarative) {
-        for(qmldemo, qmldemos) {
-            executables.files += $$QT_BUILD_TREE/demos/embedded/$${qmldemo}/$${qmldemo}.exe
-            reg_resource.files += $$regResourceDir(demos/embedded/$${qmldemo}/$${qmldemo}_reg.rsc)
-            resource.files += $$appResourceDir(demos/embedded/$${qmldemo}/$${qmldemo}.rsc)
-            mifs.files += $$appResourceDir(demos/embedded/$${qmldemo}/$${qmldemo}.mif)
-        }
-    }
-
-    files.files = $$PWD/screenshots $$PWD/slides
-    files.path = .
-
-    config.files = $$PWD/config_s60/config.xml
-    config.path = .
-
-    viewerimages.files = $$PWD/../embeddedsvgviewer/shapes.svg
-    viewerimages.path = /data/images/qt/demos/embeddedsvgviewer
-
-    # demos/mediaplayer make also use of these files.
-    desktopservices_music.files = \
-        $$PWD/../desktopservices/data/*.mp3 \
-        $$PWD/../desktopservices/data/*.wav
-    desktopservices_music.path = /data/sounds
-
-    desktopservices_images.files = $$PWD/../desktopservices/data/*.png
-    desktopservices_images.path = /data/images
-
-    saxbookmarks.files = $$PWD/../../../examples/xml/saxbookmarks/frank.xbel
-    saxbookmarks.files += $$PWD/../../../examples/xml/saxbookmarks/jennifer.xbel
-    saxbookmarks.path = /data/qt/saxbookmarks
-
-    fluidbackup.files = backup_registration.xml
-    fluidbackup.path = /private/$$replace(TARGET.UID3, 0x,)
-
-    DEPLOYMENT += config files executables viewerimages saxbookmarks reg_resource resource \
-        mifs desktopservices_music desktopservices_images fluidbackup
-
-    contains(QT_CONFIG, declarative):for(qmldemo, qmldemos):include($$QT_BUILD_TREE/demos/embedded/$${qmldemo}/deployment.pri)
-
-    DEPLOYMENT.installer_header = 0xA000D7CD
-
-    TARGET.EPOCHEAPSIZE = 100000 20000000
-}
diff --git a/doc/src/demos/desktopservices.qdoc b/doc/src/examples/desktopservices.qdoc
index f1abed8..7def082 100644
--- a/doc/src/demos/desktopservices.qdoc
+++ b/doc/src/examples/desktopservices.qdoc
@@ -26,8 +26,8 @@
 ****************************************************************************/
 
 /*!
-    \example demos/embedded/desktopservices
-    \title Embedded Desktop Services Demonstration
+    \example embedded/desktopservices
+    \title Embedded Desktop Services
 
     \image embeddeddesktopservices-demo.png
 */
diff --git a/doc/src/demos/embeddedsvgviewer.qdoc b/doc/src/examples/embeddedsvgviewer.qdoc
index 044923a..dc5890c 100644
--- a/doc/src/demos/embeddedsvgviewer.qdoc
+++ b/doc/src/examples/embeddedsvgviewer.qdoc
@@ -26,8 +26,8 @@
 ****************************************************************************/
 
 /*!
-    \example demos/embedded/embeddedsvgviewer
-    \title Embedded SVG Viewer Demonstration
+    \example embedded/embeddedsvgviewer
+    \title Embedded SVG Viewer
 
     \image embeddedsvgviewer-demo.png
 */
diff --git a/doc/src/demos/fluidlauncher.qdoc b/doc/src/examples/fluidlauncher.qdoc
index 42623e8..fdaeb1e 100644
--- a/doc/src/demos/fluidlauncher.qdoc
+++ b/doc/src/examples/fluidlauncher.qdoc
@@ -26,8 +26,8 @@
 ****************************************************************************/
 
 /*!
-    \example demos/embedded/fluidlauncher
-    \title Fluid Launcher Demonstration
+    \example embedded/fluidlauncher
+    \title Fluid Launcher
 
     \image fluidlauncher-demo.png
 */
diff --git a/doc/src/demos/weatherinfo.qdoc b/doc/src/examples/weatherinfo.qdoc
index 1f8a3e8..29a1682 100644
--- a/doc/src/demos/weatherinfo.qdoc
+++ b/doc/src/examples/weatherinfo.qdoc
@@ -26,8 +26,8 @@
 ****************************************************************************/
 
 /*!
-    \example demos/embedded/weatherinfo
-    \title Weather Info Demonstration
+    \example embedded/weatherinfo
+    \title Weather Info
 
     \image weatherinfo-demo.png
 */
diff --git a/demos/embedded/desktopservices/contenttab.cpp b/examples/embedded/desktopservices/contenttab.cpp
index 49c1260..49c1260 100644
--- a/demos/embedded/desktopservices/contenttab.cpp
+++ b/examples/embedded/desktopservices/contenttab.cpp
diff --git a/demos/embedded/desktopservices/contenttab.h b/examples/embedded/desktopservices/contenttab.h
index 614f42a..614f42a 100644
--- a/demos/embedded/desktopservices/contenttab.h
+++ b/examples/embedded/desktopservices/contenttab.h
diff --git a/demos/embedded/desktopservices/data/Explosion.wav b/examples/embedded/desktopservices/data/Explosion.wav
index 7b140b1..7b140b1 100644
--- a/demos/embedded/desktopservices/data/Explosion.wav
+++ b/examples/embedded/desktopservices/data/Explosion.wav
diff --git a/demos/embedded/desktopservices/data/designer.png b/examples/embedded/desktopservices/data/designer.png
index 1485efa..1485efa 100644
--- a/demos/embedded/desktopservices/data/designer.png
+++ b/examples/embedded/desktopservices/data/designer.png
diff --git a/demos/embedded/desktopservices/data/monkey_on_64x64.png b/examples/embedded/desktopservices/data/monkey_on_64x64.png
index 990f604..990f604 100644
--- a/demos/embedded/desktopservices/data/monkey_on_64x64.png
+++ b/examples/embedded/desktopservices/data/monkey_on_64x64.png
diff --git a/demos/embedded/desktopservices/data/sax.mp3 b/examples/embedded/desktopservices/data/sax.mp3
index d77c817..d77c817 100644
--- a/demos/embedded/desktopservices/data/sax.mp3
+++ b/examples/embedded/desktopservices/data/sax.mp3
diff --git a/demos/embedded/desktopservices/desktopservices.pro b/examples/embedded/desktopservices/desktopservices.pro
index 4dd1968..ae151d3 100644
--- a/demos/embedded/desktopservices/desktopservices.pro
+++ b/examples/embedded/desktopservices/desktopservices.pro
@@ -10,9 +10,9 @@ RESOURCES += desktopservices.qrc
 music.files = data/*.mp3 data/*.wav
 image.files = data/*.png
 
-target.path = $$[QT_INSTALL_DEMOS]/qtsvg/embedded/desktopservices
+target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/desktopservices
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_DEMOS]/qtsvg/embedded/desktopservices
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/desktopservices
 
 symbian {
     TARGET.UID3 = 0xA000C611
diff --git a/demos/embedded/desktopservices/desktopservices.qrc b/examples/embedded/desktopservices/desktopservices.qrc
index 410175f..410175f 100644
--- a/demos/embedded/desktopservices/desktopservices.qrc
+++ b/examples/embedded/desktopservices/desktopservices.qrc
diff --git a/demos/embedded/desktopservices/desktopwidget.cpp b/examples/embedded/desktopservices/desktopwidget.cpp
index d34bb98..d34bb98 100644
--- a/demos/embedded/desktopservices/desktopwidget.cpp
+++ b/examples/embedded/desktopservices/desktopwidget.cpp
diff --git a/demos/embedded/desktopservices/desktopwidget.h b/examples/embedded/desktopservices/desktopwidget.h
index 4f0db01..4f0db01 100644
--- a/demos/embedded/desktopservices/desktopwidget.h
+++ b/examples/embedded/desktopservices/desktopwidget.h
diff --git a/demos/embedded/desktopservices/linktab.cpp b/examples/embedded/desktopservices/linktab.cpp
index acc7dfa..acc7dfa 100644
--- a/demos/embedded/desktopservices/linktab.cpp
+++ b/examples/embedded/desktopservices/linktab.cpp
diff --git a/demos/embedded/desktopservices/linktab.h b/examples/embedded/desktopservices/linktab.h
index 03609f7..03609f7 100644
--- a/demos/embedded/desktopservices/linktab.h
+++ b/examples/embedded/desktopservices/linktab.h
diff --git a/demos/embedded/desktopservices/main.cpp b/examples/embedded/desktopservices/main.cpp
index 2122f5a..2122f5a 100644
--- a/demos/embedded/desktopservices/main.cpp
+++ b/examples/embedded/desktopservices/main.cpp
diff --git a/demos/embedded/desktopservices/resources/browser.png b/examples/embedded/desktopservices/resources/browser.png
index 9ecda6b..9ecda6b 100644
--- a/demos/embedded/desktopservices/resources/browser.png
+++ b/examples/embedded/desktopservices/resources/browser.png
diff --git a/demos/embedded/desktopservices/resources/heart.svg b/examples/embedded/desktopservices/resources/heart.svg
index ba5f050..ba5f050 100644
--- a/demos/embedded/desktopservices/resources/heart.svg
+++ b/examples/embedded/desktopservices/resources/heart.svg
diff --git a/demos/embedded/desktopservices/resources/message.png b/examples/embedded/desktopservices/resources/message.png
index 78917c7..78917c7 100644
--- a/demos/embedded/desktopservices/resources/message.png
+++ b/examples/embedded/desktopservices/resources/message.png
diff --git a/demos/embedded/desktopservices/resources/music.png b/examples/embedded/desktopservices/resources/music.png
index cc569cb..cc569cb 100644
--- a/demos/embedded/desktopservices/resources/music.png
+++ b/examples/embedded/desktopservices/resources/music.png
diff --git a/demos/embedded/desktopservices/resources/photo.png b/examples/embedded/desktopservices/resources/photo.png
index ac81cf3..ac81cf3 100644
--- a/demos/embedded/desktopservices/resources/photo.png
+++ b/examples/embedded/desktopservices/resources/photo.png
diff --git a/demos/embedded/embedded.pro b/examples/embedded/embedded.pro
index 8adae72..8adae72 100644
--- a/demos/embedded/embedded.pro
+++ b/examples/embedded/embedded.pro
diff --git a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp b/examples/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp
index 4980cf4..4980cf4 100644
--- a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp
+++ b/examples/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp
diff --git a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.h b/examples/embedded/embeddedsvgviewer/embeddedsvgviewer.h
index a9bdfdf..a9bdfdf 100644
--- a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.h
+++ b/examples/embedded/embeddedsvgviewer/embeddedsvgviewer.h
diff --git a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro b/examples/embedded/embeddedsvgviewer/embeddedsvgviewer.pro
index 313423d..b55aee2 100644
--- a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro
+++ b/examples/embedded/embeddedsvgviewer/embeddedsvgviewer.pro
@@ -6,9 +6,9 @@ HEADERS += embeddedsvgviewer.h
 SOURCES += embeddedsvgviewer.cpp main.cpp
 RESOURCES += embeddedsvgviewer.qrc
 
-target.path = $$[QT_INSTALL_DEMOS]/qtsvg/embedded/embeddedsvgviewer
+target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/embeddedsvgviewer
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.svg files
-sources.path = $$[QT_INSTALL_DEMOS]/qtsvg/embedded/embeddedsvgviewer
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/embeddedsvgviewer
 INSTALLS += target sources
 
 wince* {
diff --git a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.qrc b/examples/embedded/embeddedsvgviewer/embeddedsvgviewer.qrc
index bb02118..bb02118 100644
--- a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.qrc
+++ b/examples/embedded/embeddedsvgviewer/embeddedsvgviewer.qrc
diff --git a/demos/embedded/embeddedsvgviewer/files/default.svg b/examples/embedded/embeddedsvgviewer/files/default.svg
index c28a711..c28a711 100644
--- a/demos/embedded/embeddedsvgviewer/files/default.svg
+++ b/examples/embedded/embeddedsvgviewer/files/default.svg
diff --git a/demos/embedded/embeddedsvgviewer/files/v-slider-handle.svg b/examples/embedded/embeddedsvgviewer/files/v-slider-handle.svg
index 4ee87f8..4ee87f8 100644
--- a/demos/embedded/embeddedsvgviewer/files/v-slider-handle.svg
+++ b/examples/embedded/embeddedsvgviewer/files/v-slider-handle.svg
diff --git a/demos/embedded/embeddedsvgviewer/main.cpp b/examples/embedded/embeddedsvgviewer/main.cpp
index d1f07b9..d1f07b9 100644
--- a/demos/embedded/embeddedsvgviewer/main.cpp
+++ b/examples/embedded/embeddedsvgviewer/main.cpp
diff --git a/demos/embedded/embeddedsvgviewer/shapes.svg b/examples/embedded/embeddedsvgviewer/shapes.svg
index c28a711..c28a711 100644
--- a/demos/embedded/embeddedsvgviewer/shapes.svg
+++ b/examples/embedded/embeddedsvgviewer/shapes.svg
diff --git a/demos/embedded/embeddedsvgviewer/spheres.svg b/examples/embedded/embeddedsvgviewer/spheres.svg
index e108777..e108777 100644
--- a/demos/embedded/embeddedsvgviewer/spheres.svg
+++ b/examples/embedded/embeddedsvgviewer/spheres.svg
diff --git a/demos/embedded/fluidlauncher/backup_registration.xml b/examples/embedded/fluidlauncher/backup_registration.xml
index 794e11d..794e11d 100644
--- a/demos/embedded/fluidlauncher/backup_registration.xml
+++ b/examples/embedded/fluidlauncher/backup_registration.xml
diff --git a/demos/embedded/fluidlauncher/config.xml b/examples/embedded/fluidlauncher/config.xml
index 6cb4be7..6cb4be7 100644
--- a/demos/embedded/fluidlauncher/config.xml
+++ b/examples/embedded/fluidlauncher/config.xml
diff --git a/demos/embedded/fluidlauncher/config_s60/config.xml b/examples/embedded/fluidlauncher/config_s60/config.xml
index 4f10488..4f10488 100644
--- a/demos/embedded/fluidlauncher/config_s60/config.xml
+++ b/examples/embedded/fluidlauncher/config_s60/config.xml
diff --git a/demos/embedded/fluidlauncher/config_wince/config.xml b/examples/embedded/fluidlauncher/config_wince/config.xml
index 3b57770..3b57770 100644
--- a/demos/embedded/fluidlauncher/config_wince/config.xml
+++ b/examples/embedded/fluidlauncher/config_wince/config.xml
diff --git a/demos/embedded/fluidlauncher/demoapplication.cpp b/examples/embedded/fluidlauncher/demoapplication.cpp
index c0ee032..c0ee032 100644
--- a/demos/embedded/fluidlauncher/demoapplication.cpp
+++ b/examples/embedded/fluidlauncher/demoapplication.cpp
diff --git a/demos/embedded/fluidlauncher/demoapplication.h b/examples/embedded/fluidlauncher/demoapplication.h
index 8eceec9..8eceec9 100644
--- a/demos/embedded/fluidlauncher/demoapplication.h
+++ b/examples/embedded/fluidlauncher/demoapplication.h
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.cpp b/examples/embedded/fluidlauncher/fluidlauncher.cpp
index 3eee703..3eee703 100644
--- a/demos/embedded/fluidlauncher/fluidlauncher.cpp
+++ b/examples/embedded/fluidlauncher/fluidlauncher.cpp
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.h b/examples/embedded/fluidlauncher/fluidlauncher.h
index 4371537..4371537 100644
--- a/demos/embedded/fluidlauncher/fluidlauncher.h
+++ b/examples/embedded/fluidlauncher/fluidlauncher.h
diff --git a/examples/embedded/fluidlauncher/fluidlauncher.pro b/examples/embedded/fluidlauncher/fluidlauncher.pro
new file mode 100644
index 0000000..272be25
--- /dev/null
+++ b/examples/embedded/fluidlauncher/fluidlauncher.pro
@@ -0,0 +1,263 @@
+TEMPLATE = app
+TARGET =
+DEPENDPATH += .
+INCLUDEPATH += .
+VERSION = $$QT_VERSION
+
+# Input
+HEADERS += \
+           demoapplication.h \
+           fluidlauncher.h \
+           pictureflow.h \
+           slideshow.h
+
+SOURCES += \
+           demoapplication.cpp \
+           fluidlauncher.cpp \
+           main.cpp \
+           pictureflow.cpp \
+           slideshow.cpp
+
+embedded{
+    target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/fluidlauncher
+    sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html config.xml screenshots slides
+    sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/fluidlauncher
+    INSTALLS += target sources
+}
+
+wince*{
+    QT += svg
+
+    BUILD_DIR = release
+    if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
+        BUILD_DIR = debug
+    }
+
+    executables.files = \
+        $$QT_BUILD_TREE/qtsvg/examples/embedded/embeddedsvgviewer/$${BUILD_DIR}/embeddedsvgviewer.exe \
+        $$QT_BUILD_TREE/qtbase/examples/embedded/styleexample/$${BUILD_DIR}/styleexample.exe \
+        $$QT_BUILD_TREE/qtbase/examples/painting/deform/$${BUILD_DIR}/deform.exe \
+        $$QT_BUILD_TREE/qtbase/examples/painting/pathstroke/$${BUILD_DIR}/pathstroke.exe \
+        $$QT_BUILD_TREE/qtbase/examples/graphicsview/elasticnodes/$${BUILD_DIR}/elasticnodes.exe \
+        $$QT_BUILD_TREE/qtbase/examples/widgets/wiggly/$${BUILD_DIR}/wiggly.exe \
+        $$QT_BUILD_TREE/qtbase/examples/painting/concentriccircles/$${BUILD_DIR}/concentriccircles.exe \
+        $$QT_BUILD_TREE/qtbase/examples/draganddrop/$${BUILD_DIR}/fridgemagnets.exe
+
+    executables.path = .
+
+    files.files = $$PWD/screenshots $$PWD/slides $$PWD/../embeddedsvgviewer/shapes.svg
+    files.path = .
+
+    config.files = $$PWD/config_wince/config.xml
+    config.path = .
+
+    DEPLOYMENT += config files executables
+
+    DEPLOYMENT_PLUGIN += qgif qjpeg qmng qsvg
+}
+
+symbian {
+    load(data_caging_paths)
+    CONFIG += qt_demo
+    RSS_RULES = # Clear RSS_RULES, otherwise fluidlauncher will get put into QtDemos folder
+
+    TARGET.UID3 = 0xA000A641
+
+    defineReplace(regResourceDir) {
+        symbian-abld|symbian-sbsv2 {
+            return($${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/$$basename(1))
+        } else {
+            return($${QT_BUILD_TREE}/$$1)
+        }
+    }
+
+    defineReplace(appResourceDir) {
+        symbian-abld|symbian-sbsv2 {
+            return($${EPOCROOT}$${HW_ZDIR}$${APP_RESOURCE_DIR}/$$basename(1))
+        } else {
+            return($${QT_BUILD_TREE}/$$1)
+        }
+    }
+
+    executables.files = \
+        $$QT_BUILD_TREE/qtbase/examples/embedded/styleexample/styleexample.exe \
+        $$QT_BUILD_TREE/qtbase/examples/painting/deform/deform.exe \
+        $$QT_BUILD_TREE/qtbase/examples/painting/pathstroke/pathstroke.exe \
+        $$QT_BUILD_TREE/qtbase/examples/widgets/wiggly/wiggly.exe \
+        $$QT_BUILD_TREE/qtbase/examples/network/qftp/qftp.exe \
+        $$QT_BUILD_TREE/qtbase/examples/xml/saxbookmarks/saxbookmarks.exe \
+        $$QT_BUILD_TREE/qtsvg/examples/embedded/desktopservices/desktopservices.exe \
+        $$QT_BUILD_TREE/qtbase/examples/draganddrop/fridgemagnets/fridgemagnets.exe \
+        $$QT_BUILD_TREE/qtbase/examples/widgets/softkeys/softkeys.exe \
+        $$QT_BUILD_TREE/qtbase/examples/embedded/raycasting/raycasting.exe \
+        $$QT_BUILD_TREE/qtbase/examples/embedded/flickable/flickable.exe \
+        $$QT_BUILD_TREE/qtbase/examples/embedded/digiflip/digiflip.exe \
+        $$QT_BUILD_TREE/qtbase/examples/embedded/lightmaps/lightmaps.exe \
+        $$QT_BUILD_TREE/qtbase/examples/embedded/flightinfo/flightinfo.exe
+
+    executables.path = /sys/bin
+
+    reg_resource.files = \
+        $$regResourceDir(qtbase/examples/embedded/styleexample/styleexample_reg.rsc) \
+        $$regResourceDir(qtbase/examples/painting/deform/deform_reg.rsc) \
+        $$regResourceDir(qtbase/examples/pathstroke/pathstroke_reg.rsc) \
+        $$regResourceDir(qtbase/examples/widgets/wiggly/wiggly_reg.rsc) \
+        $$regResourceDir(qtbase/examples/network/qftp/qftp_reg.rsc)\
+        $$regResourceDir(qtbase/examples/xml/saxbookmarks/saxbookmarks_reg.rsc) \
+        $$regResourceDir(qtsvg/examples/embedded/desktopservices/desktopservices_reg.rsc) \
+        $$regResourceDir(qtbase/examples/draganddrop/fridgemagnets/fridgemagnets_reg.rsc) \
+        $$regResourceDir(qtbase/examples/widgets/softkeys/softkeys_reg.rsc) \
+        $$regResourceDir(qtbase/examples/embedded/raycasting/raycasting_reg.rsc) \
+        $$regResourceDir(qtbase/examples/embedded/flickable/flickable_reg.rsc) \
+        $$regResourceDir(qtbase/examples/embedded/digiflip/digiflip_reg.rsc) \
+        $$regResourceDir(qtbase/examples/embedded/lightmaps/lightmaps_reg.rsc) \
+        $$regResourceDir(qtbase/examples/embedded/flightinfo/flightinfo_reg.rsc)
+
+    contains(QT_CONFIG, phonon) {
+        reg_resource.files += $$regResourceDir(qtphonon/examples/qmediaplayer/qmediaplayer_reg.rsc)
+    }
+
+    contains(QT_CONFIG, multimedia) {
+        reg_resource.files += $$regResourceDir(qtmultimedia/examples/spectrum/app/spectrum_reg.rsc)
+    }
+
+
+    reg_resource.path = $$REG_RESOURCE_IMPORT_DIR
+
+    resource.files = \
+        $$appResourceDir(qtbase/examples/embedded/styledemo/styledemo.rsc) \
+        $$appResourceDir(qtbase/examples/painting/deform/deform.rsc) \
+        $$appResourceDir(qtbase/examples/painting/pathstroke/pathstroke.rsc) \
+        $$appResourceDir(qtbase/examples/widgets/wiggly/wiggly.rsc) \
+        $$appResourceDir(qtbase/examples/network/qftp/qftp.rsc)\
+        $$appResourceDir(qtbase/examples/xml/saxbookmarks/saxbookmarks.rsc) \
+        $$appResourceDir(qtsvg/examples/embedded/desktopservices/desktopservices.rsc) \
+        $$appResourceDir(qtbase/examples/draganddrop/fridgemagnets/fridgemagnets.rsc) \
+        $$appResourceDir(qtbase/examples/widgets/softkeys/softkeys.rsc) \
+        $$appResourceDir(qtbase/examples/embedded/raycasting/raycasting.rsc) \
+        $$appResourceDir(qtbase/examples/embedded/flickable/flickable.rsc) \
+        $$appResourceDir(qtbase/examples/embedded/digiflip/digiflip.rsc) \
+        $$appResourceDir(qtbase/examples/embedded/lightmaps/lightmaps.rsc) \
+        $$appResourceDir(qtbase/examples/embedded/flightinfo/flightinfo.rsc)
+
+
+    resource.path = $$APP_RESOURCE_DIR
+
+    mifs.files = \
+        $$appResourceDir(qtsvg/examples/embedded/fluidlauncher/fluidlauncher.mif) \
+        $$appResourceDir(qtbase/examples/embedded/styledemo/styledemo.mif) \
+        $$appResourceDir(qtbase/examples/painting/deform/deform.mif) \
+        $$appResourceDir(qtbase/examples/painting/pathstroke/pathstroke.mif) \
+        $$appResourceDir(qtbase/examples/widgets/wiggly/wiggly.mif) \
+        $$appResourceDir(qtbase/examples/network/qftp/qftp.mif) \
+        $$appResourceDir(qtbase/examples/xml/saxbookmarks/saxbookmarks.mif) \
+        $$appResourceDir(qtsvg/examples/embedded/desktopservices/desktopservices.mif) \
+        $$appResourceDir(qtbase/examples/draganddrop/fridgemagnets/fridgemagnets.mif) \
+        $$appResourceDir(qtbase/examples/widgets/softkeys/softkeys.mif) \
+        $$appResourceDir(qtbase/examples/embedded/raycasting/raycasting.mif) \
+        $$appResourceDir(qtbase/examples/embedded/flickable/flickable.mif) \
+        $$appResourceDir(qtbase/examples/embedded/digiflip/digiflip.mif) \
+        $$appResourceDir(qtbase/examples/embedded/lightmaps/lightmaps.mif) \
+        $$appResourceDir(qtbase/examples/embedded/flightinfo/flightinfo.mif)
+    mifs.path = $$APP_RESOURCE_DIR
+
+    contains(QT_CONFIG, svg) {
+        executables.files += \
+            $$QT_BUILD_TREE/qtsvg/examples/embedded/embeddedsvgviewer/embeddedsvgviewer.exe \
+            $$QT_BUILD_TREE/qtsvg/examples/embedded/weatherinfo/weatherinfo.exe
+
+        reg_resource.files += \
+            $$regResourceDir(qtsvg/examples/embedded/embeddedsvgviewer/embeddedsvgviewer_reg.rsc) \
+            $$regResourceDir(qtsvg/examples/embedded/weatherinfo/weatherinfo_reg.rsc)
+
+        resource.files += \
+            $$appResourceDir(qtsvg/examples/embedded/embeddedsvgviewer/embeddedsvgviewer.rsc) \
+            $$appResourceDir(qtsvg/examples/embedded/weatherinfo/weatherinfo.rsc)
+
+        mifs.files += \
+            $$appResourceDir(qtsvg/examples/embedded/embeddedsvgviewer/embeddedsvgviewer.mif) \
+            $$appResourceDir(qtsvg/examples/embedded/weatherinfo/weatherinfo.mif)
+
+    }
+    contains(QT_CONFIG, webkit) {
+        executables.files += $$QT_BUILD_TREE/qtwebkit-examples-and-demos/examples/embedded/anomaly/anomaly.exe
+        reg_resource.files += $$regResourceDir(qtwebkit-examples-and-demos/examples/embedded/anomaly/anomaly_reg.rsc)
+        resource.files += $$appResourceDir(qtwebkit-examples-and-demos/examples/embedded/anomaly/anomaly.rsc)
+        mifs.files += \
+            $$appResourceDir(qtwebkit-examples-and-demos/examples/embedded/anomaly/anomaly.mif)
+
+        isEmpty(QT_LIBINFIX) {
+            # Since Fluidlauncher itself doesn't link webkit, we won't get dependency automatically
+            executables.pkg_prerules += \
+                "; Dependency to Qt Webkit" \
+                "(0x200267C2), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION},  {\"QtWebKit\"}"
+        }
+    }
+
+    contains(QT_CONFIG, phonon) {
+        executables.files += $$QT_BUILD_TREE/qtphonon/examples/qmediaplayer/qmediaplayer.exe
+        resource.files += $$appResourceDir(qtphonon/examples/qmediaplayer/qmediaplayer.rsc)
+        mifs.files += \
+            $$appResourceDir(qtphonon/examples/qmediaplayer/qmediaplayer.mif)
+    }
+
+    contains(QT_CONFIG, multimedia) {
+        executables.files += $$QT_BUILD_TREE/qtmultimedia/examples/spectrum/app/spectrum.exe
+        executables.files += $$QT_BUILD_TREE/qtmultimedia/examples/spectrum/3rdparty/fftreal/fftreal.dll
+        resource.files += $$appResourceDir(qtmultimedia/examples/spectrum/app/spectrum.rsc)
+        mifs.files += \
+            $$appResourceDir(qtmultimedia/examples/spectrum/app/spectrum.mif)
+    }
+
+    contains(QT_CONFIG, script) {
+        executables.files += $$QT_BUILD_TREE/qtscript/examples/script/context2d/context2d.exe
+        reg_resource.files += $$regResourceDir(qtscript/examples/script/context2d/context2d_reg.rsc)
+        resource.files += $$appResourceDir(qtscript/examples/script/context2d/context2d.rsc)
+        mifs.files += \
+            $$appResourceDir(qtscript/examples/script/context2d/context2d.mif)
+    }
+
+    qmldemos = qmlcalculator qmlclocks qmldialcontrol qmleasing qmlflickr qmlphotoviewer qmltwitter
+    contains(QT_CONFIG, declarative) {
+        for(qmldemo, qmldemos) {
+            executables.files += $$QT_BUILD_TREE/qtdeclarative/examples/embedded/$${qmldemo}/$${qmldemo}.exe
+            reg_resource.files += $$regResourceDir(qtdeclarative/examples/embedded/$${qmldemo}/$${qmldemo}_reg.rsc)
+            resource.files += $$appResourceDir(qtdeclarative/examples/embedded/$${qmldemo}/$${qmldemo}.rsc)
+            mifs.files += $$appResourceDir(qtdeclarative/examples/embedded/$${qmldemo}/$${qmldemo}.mif)
+        }
+    }
+
+    files.files = $$PWD/screenshots $$PWD/slides
+    files.path = .
+
+    config.files = $$PWD/config_s60/config.xml
+    config.path = .
+
+    viewerimages.files = $$PWD/../embeddedsvgviewer/shapes.svg
+    viewerimages.path = /data/images/qt/demos/embeddedsvgviewer
+
+    # demos/mediaplayer make also use of these files.
+    desktopservices_music.files = \
+        $$PWD/../desktopservices/data/*.mp3 \
+        $$PWD/../desktopservices/data/*.wav
+    desktopservices_music.path = /data/sounds
+
+    desktopservices_images.files = $$PWD/../desktopservices/data/*.png
+    desktopservices_images.path = /data/images
+
+    saxbookmarks.files = $$QT_BUILD_TREE/examples/xml/saxbookmarks/frank.xbel
+    saxbookmarks.files += $$QT_BUILD_TREE/examples/xml/saxbookmarks/jennifer.xbel
+    saxbookmarks.path = /data/qt/saxbookmarks
+
+    fluidbackup.files = backup_registration.xml
+    fluidbackup.path = /private/$$replace(TARGET.UID3, 0x,)
+
+    DEPLOYMENT += config files executables viewerimages saxbookmarks reg_resource resource \
+        mifs desktopservices_music desktopservices_images fluidbackup
+
+    contains(QT_CONFIG, declarative):for(qmldemo, qmldemos):include($$QT_BUILD_TREE/qtdeclarative/examples/embedded/$${qmldemo}/deployment.pri)
+
+    DEPLOYMENT.installer_header = 0xA000D7CD
+
+    TARGET.EPOCHEAPSIZE = 100000 20000000
+}
diff --git a/demos/embedded/fluidlauncher/main.cpp b/examples/embedded/fluidlauncher/main.cpp
index 120d4ca..120d4ca 100644
--- a/demos/embedded/fluidlauncher/main.cpp
+++ b/examples/embedded/fluidlauncher/main.cpp
diff --git a/demos/embedded/fluidlauncher/pictureflow.cpp b/examples/embedded/fluidlauncher/pictureflow.cpp
index dd00b59..dd00b59 100644
--- a/demos/embedded/fluidlauncher/pictureflow.cpp
+++ b/examples/embedded/fluidlauncher/pictureflow.cpp
diff --git a/demos/embedded/fluidlauncher/pictureflow.h b/examples/embedded/fluidlauncher/pictureflow.h
index c25a340..c25a340 100644
--- a/demos/embedded/fluidlauncher/pictureflow.h
+++ b/examples/embedded/fluidlauncher/pictureflow.h
diff --git a/demos/embedded/fluidlauncher/screenshots/anomaly_s60.png b/examples/embedded/fluidlauncher/screenshots/anomaly_s60.png
index 8d537f4..8d537f4 100644
--- a/demos/embedded/fluidlauncher/screenshots/anomaly_s60.png
+++ b/examples/embedded/fluidlauncher/screenshots/anomaly_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/concentriccircles.png b/examples/embedded/fluidlauncher/screenshots/concentriccircles.png
index fd308b5..fd308b5 100644
--- a/demos/embedded/fluidlauncher/screenshots/concentriccircles.png
+++ b/examples/embedded/fluidlauncher/screenshots/concentriccircles.png
diff --git a/demos/embedded/fluidlauncher/screenshots/context2d_s60.png b/examples/embedded/fluidlauncher/screenshots/context2d_s60.png
index 9c288c9..9c288c9 100644
--- a/demos/embedded/fluidlauncher/screenshots/context2d_s60.png
+++ b/examples/embedded/fluidlauncher/screenshots/context2d_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/deform.png b/examples/embedded/fluidlauncher/screenshots/deform.png
index c22f2ae..c22f2ae 100644
--- a/demos/embedded/fluidlauncher/screenshots/deform.png
+++ b/examples/embedded/fluidlauncher/screenshots/deform.png
diff --git a/demos/embedded/fluidlauncher/screenshots/desktopservices_s60.png b/examples/embedded/fluidlauncher/screenshots/desktopservices_s60.png
index 64018f4..64018f4 100644
--- a/demos/embedded/fluidlauncher/screenshots/desktopservices_s60.png
+++ b/examples/embedded/fluidlauncher/screenshots/desktopservices_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/digiflip.png b/examples/embedded/fluidlauncher/screenshots/digiflip.png
index c31a6f8..c31a6f8 100644
--- a/demos/embedded/fluidlauncher/screenshots/digiflip.png
+++ b/examples/embedded/fluidlauncher/screenshots/digiflip.png
diff --git a/demos/embedded/fluidlauncher/screenshots/elasticnodes.png b/examples/embedded/fluidlauncher/screenshots/elasticnodes.png
index bc157e5..bc157e5 100644
--- a/demos/embedded/fluidlauncher/screenshots/elasticnodes.png
+++ b/examples/embedded/fluidlauncher/screenshots/elasticnodes.png
diff --git a/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer.png b/examples/embedded/fluidlauncher/screenshots/embeddedsvgviewer.png
index 522f13b..522f13b 100644
--- a/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer.png
+++ b/examples/embedded/fluidlauncher/screenshots/embeddedsvgviewer.png
diff --git a/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png b/examples/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png
index 74f4ad1..74f4ad1 100644
--- a/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png
+++ b/examples/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/flickable.png b/examples/embedded/fluidlauncher/screenshots/flickable.png
index bad14bf..bad14bf 100644
--- a/demos/embedded/fluidlauncher/screenshots/flickable.png
+++ b/examples/embedded/fluidlauncher/screenshots/flickable.png
diff --git a/demos/embedded/fluidlauncher/screenshots/flightinfo_s60.png b/examples/embedded/fluidlauncher/screenshots/flightinfo_s60.png
index 8e74d77..8e74d77 100644
--- a/demos/embedded/fluidlauncher/screenshots/flightinfo_s60.png
+++ b/examples/embedded/fluidlauncher/screenshots/flightinfo_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png b/examples/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png
index d31875d..d31875d 100644
--- a/demos/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png
+++ b/examples/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/ftp_s60.png b/examples/embedded/fluidlauncher/screenshots/ftp_s60.png
index 5858daf..5858daf 100644
--- a/demos/embedded/fluidlauncher/screenshots/ftp_s60.png
+++ b/examples/embedded/fluidlauncher/screenshots/ftp_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/lightmaps.png b/examples/embedded/fluidlauncher/screenshots/lightmaps.png
index 18aa74d..18aa74d 100644
--- a/demos/embedded/fluidlauncher/screenshots/lightmaps.png
+++ b/examples/embedded/fluidlauncher/screenshots/lightmaps.png
diff --git a/demos/embedded/fluidlauncher/screenshots/mediaplayer.png b/examples/embedded/fluidlauncher/screenshots/mediaplayer.png
index c9fd43c..c9fd43c 100644
--- a/demos/embedded/fluidlauncher/screenshots/mediaplayer.png
+++ b/examples/embedded/fluidlauncher/screenshots/mediaplayer.png
diff --git a/demos/embedded/fluidlauncher/screenshots/pathstroke.png b/examples/embedded/fluidlauncher/screenshots/pathstroke.png
index c3d727e..c3d727e 100644
--- a/demos/embedded/fluidlauncher/screenshots/pathstroke.png
+++ b/examples/embedded/fluidlauncher/screenshots/pathstroke.png
diff --git a/demos/embedded/fluidlauncher/screenshots/qmlcalculator.png b/examples/embedded/fluidlauncher/screenshots/qmlcalculator.png
index f4218f5..f4218f5 100644
--- a/demos/embedded/fluidlauncher/screenshots/qmlcalculator.png
+++ b/examples/embedded/fluidlauncher/screenshots/qmlcalculator.png
diff --git a/demos/embedded/fluidlauncher/screenshots/qmlclocks.png b/examples/embedded/fluidlauncher/screenshots/qmlclocks.png
index ba25a18..ba25a18 100644
--- a/demos/embedded/fluidlauncher/screenshots/qmlclocks.png
+++ b/examples/embedded/fluidlauncher/screenshots/qmlclocks.png
diff --git a/demos/embedded/fluidlauncher/screenshots/qmldialcontrol.png b/examples/embedded/fluidlauncher/screenshots/qmldialcontrol.png
index b8def8c..b8def8c 100644
--- a/demos/embedded/fluidlauncher/screenshots/qmldialcontrol.png
+++ b/examples/embedded/fluidlauncher/screenshots/qmldialcontrol.png
diff --git a/demos/embedded/fluidlauncher/screenshots/qmleasing.png b/examples/embedded/fluidlauncher/screenshots/qmleasing.png
index d34c2ac..d34c2ac 100644
--- a/demos/embedded/fluidlauncher/screenshots/qmleasing.png
+++ b/examples/embedded/fluidlauncher/screenshots/qmleasing.png
diff --git a/demos/embedded/fluidlauncher/screenshots/qmlflickr.jpg b/examples/embedded/fluidlauncher/screenshots/qmlflickr.jpg
index d7faabf..d7faabf 100644
--- a/demos/embedded/fluidlauncher/screenshots/qmlflickr.jpg
+++ b/examples/embedded/fluidlauncher/screenshots/qmlflickr.jpg
diff --git a/demos/embedded/fluidlauncher/screenshots/qmlphotoviewer.jpg b/examples/embedded/fluidlauncher/screenshots/qmlphotoviewer.jpg
index 673ffc6..673ffc6 100644
--- a/demos/embedded/fluidlauncher/screenshots/qmlphotoviewer.jpg
+++ b/examples/embedded/fluidlauncher/screenshots/qmlphotoviewer.jpg
diff --git a/demos/embedded/fluidlauncher/screenshots/qmltwitter.jpg b/examples/embedded/fluidlauncher/screenshots/qmltwitter.jpg
index 4399eea..4399eea 100644
--- a/demos/embedded/fluidlauncher/screenshots/qmltwitter.jpg
+++ b/examples/embedded/fluidlauncher/screenshots/qmltwitter.jpg
diff --git a/demos/embedded/fluidlauncher/screenshots/raycasting.png b/examples/embedded/fluidlauncher/screenshots/raycasting.png
index b6b738a..b6b738a 100644
--- a/demos/embedded/fluidlauncher/screenshots/raycasting.png
+++ b/examples/embedded/fluidlauncher/screenshots/raycasting.png
diff --git a/demos/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png b/examples/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png
index 54b6321..54b6321 100644
--- a/demos/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png
+++ b/examples/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/softkeys_s60.png b/examples/embedded/fluidlauncher/screenshots/softkeys_s60.png
index df090e2..df090e2 100644
--- a/demos/embedded/fluidlauncher/screenshots/softkeys_s60.png
+++ b/examples/embedded/fluidlauncher/screenshots/softkeys_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/spectrum.png b/examples/embedded/fluidlauncher/screenshots/spectrum.png
index 7f4938f..7f4938f 100644
--- a/demos/embedded/fluidlauncher/screenshots/spectrum.png
+++ b/examples/embedded/fluidlauncher/screenshots/spectrum.png
diff --git a/demos/embedded/fluidlauncher/screenshots/styledemo.png b/examples/embedded/fluidlauncher/screenshots/styledemo.png
index 669c488..669c488 100644
--- a/demos/embedded/fluidlauncher/screenshots/styledemo.png
+++ b/examples/embedded/fluidlauncher/screenshots/styledemo.png
diff --git a/demos/embedded/fluidlauncher/screenshots/styledemo_s60.png b/examples/embedded/fluidlauncher/screenshots/styledemo_s60.png
index 57480fb..57480fb 100644
--- a/demos/embedded/fluidlauncher/screenshots/styledemo_s60.png
+++ b/examples/embedded/fluidlauncher/screenshots/styledemo_s60.png
diff --git a/demos/embedded/fluidlauncher/screenshots/weatherinfo.png b/examples/embedded/fluidlauncher/screenshots/weatherinfo.png
index 7e23891..7e23891 100644
--- a/demos/embedded/fluidlauncher/screenshots/weatherinfo.png
+++ b/examples/embedded/fluidlauncher/screenshots/weatherinfo.png
diff --git a/demos/embedded/fluidlauncher/screenshots/wiggly.png b/examples/embedded/fluidlauncher/screenshots/wiggly.png
index b20fbc4..b20fbc4 100644
--- a/demos/embedded/fluidlauncher/screenshots/wiggly.png
+++ b/examples/embedded/fluidlauncher/screenshots/wiggly.png
diff --git a/demos/embedded/fluidlauncher/screenshots/wiggly_s60.png b/examples/embedded/fluidlauncher/screenshots/wiggly_s60.png
index 9c4cab3..9c4cab3 100644
--- a/demos/embedded/fluidlauncher/screenshots/wiggly_s60.png
+++ b/examples/embedded/fluidlauncher/screenshots/wiggly_s60.png
diff --git a/demos/embedded/fluidlauncher/slides/demo_1.png b/examples/embedded/fluidlauncher/slides/demo_1.png
index d53d19d..d53d19d 100644
--- a/demos/embedded/fluidlauncher/slides/demo_1.png
+++ b/examples/embedded/fluidlauncher/slides/demo_1.png
diff --git a/demos/embedded/fluidlauncher/slides/demo_2.png b/examples/embedded/fluidlauncher/slides/demo_2.png
index f137de0..f137de0 100644
--- a/demos/embedded/fluidlauncher/slides/demo_2.png
+++ b/examples/embedded/fluidlauncher/slides/demo_2.png
diff --git a/demos/embedded/fluidlauncher/slides/demo_3.png b/examples/embedded/fluidlauncher/slides/demo_3.png
index 8369bc0..8369bc0 100644
--- a/demos/embedded/fluidlauncher/slides/demo_3.png
+++ b/examples/embedded/fluidlauncher/slides/demo_3.png
diff --git a/demos/embedded/fluidlauncher/slides/demo_4.png b/examples/embedded/fluidlauncher/slides/demo_4.png
index 377e369..377e369 100644
--- a/demos/embedded/fluidlauncher/slides/demo_4.png
+++ b/examples/embedded/fluidlauncher/slides/demo_4.png
diff --git a/demos/embedded/fluidlauncher/slides/demo_5.png b/examples/embedded/fluidlauncher/slides/demo_5.png
index 0bb1781..0bb1781 100644
--- a/demos/embedded/fluidlauncher/slides/demo_5.png
+++ b/examples/embedded/fluidlauncher/slides/demo_5.png
diff --git a/demos/embedded/fluidlauncher/slides/demo_6.png b/examples/embedded/fluidlauncher/slides/demo_6.png
index 9daba67..9daba67 100644
--- a/demos/embedded/fluidlauncher/slides/demo_6.png
+++ b/examples/embedded/fluidlauncher/slides/demo_6.png
diff --git a/demos/embedded/fluidlauncher/slideshow.cpp b/examples/embedded/fluidlauncher/slideshow.cpp
index 7e310b9..7e310b9 100644
--- a/demos/embedded/fluidlauncher/slideshow.cpp
+++ b/examples/embedded/fluidlauncher/slideshow.cpp
diff --git a/demos/embedded/fluidlauncher/slideshow.h b/examples/embedded/fluidlauncher/slideshow.h
index 0f28f80..0f28f80 100644
--- a/demos/embedded/fluidlauncher/slideshow.h
+++ b/examples/embedded/fluidlauncher/slideshow.h
diff --git a/demos/embedded/weatherinfo/icons/README.txt b/examples/embedded/weatherinfo/icons/README.txt
index d384153..d384153 100644
--- a/demos/embedded/weatherinfo/icons/README.txt
+++ b/examples/embedded/weatherinfo/icons/README.txt
diff --git a/demos/embedded/weatherinfo/icons/weather-few-clouds.svg b/examples/embedded/weatherinfo/icons/weather-few-clouds.svg
index a53e3d6..a53e3d6 100644
--- a/demos/embedded/weatherinfo/icons/weather-few-clouds.svg
+++ b/examples/embedded/weatherinfo/icons/weather-few-clouds.svg
diff --git a/demos/embedded/weatherinfo/icons/weather-fog.svg b/examples/embedded/weatherinfo/icons/weather-fog.svg
index 56a2444..56a2444 100644
--- a/demos/embedded/weatherinfo/icons/weather-fog.svg
+++ b/examples/embedded/weatherinfo/icons/weather-fog.svg
diff --git a/demos/embedded/weatherinfo/icons/weather-haze.svg b/examples/embedded/weatherinfo/icons/weather-haze.svg
index b31811f..b31811f 100644
--- a/demos/embedded/weatherinfo/icons/weather-haze.svg
+++ b/examples/embedded/weatherinfo/icons/weather-haze.svg
diff --git a/demos/embedded/weatherinfo/icons/weather-icy.svg b/examples/embedded/weatherinfo/icons/weather-icy.svg
index 2c45b33..2c45b33 100644
--- a/demos/embedded/weatherinfo/icons/weather-icy.svg
+++ b/examples/embedded/weatherinfo/icons/weather-icy.svg
diff --git a/demos/embedded/weatherinfo/icons/weather-overcast.svg b/examples/embedded/weatherinfo/icons/weather-overcast.svg
index cf77214..cf77214 100644
--- a/demos/embedded/weatherinfo/icons/weather-overcast.svg
+++ b/examples/embedded/weatherinfo/icons/weather-overcast.svg
diff --git a/demos/embedded/weatherinfo/icons/weather-showers.svg b/examples/embedded/weatherinfo/icons/weather-showers.svg
index 017665d..017665d 100644
--- a/demos/embedded/weatherinfo/icons/weather-showers.svg
+++ b/examples/embedded/weatherinfo/icons/weather-showers.svg
diff --git a/demos/embedded/weatherinfo/icons/weather-sleet.svg b/examples/embedded/weatherinfo/icons/weather-sleet.svg
index bf2306f..bf2306f 100644
--- a/demos/embedded/weatherinfo/icons/weather-sleet.svg
+++ b/examples/embedded/weatherinfo/icons/weather-sleet.svg
diff --git a/demos/embedded/weatherinfo/icons/weather-snow.svg b/examples/embedded/weatherinfo/icons/weather-snow.svg
index a91946f..a91946f 100644
--- a/demos/embedded/weatherinfo/icons/weather-snow.svg
+++ b/examples/embedded/weatherinfo/icons/weather-snow.svg
diff --git a/demos/embedded/weatherinfo/icons/weather-storm.svg b/examples/embedded/weatherinfo/icons/weather-storm.svg
index 1ad47ab..1ad47ab 100644
--- a/demos/embedded/weatherinfo/icons/weather-storm.svg
+++ b/examples/embedded/weatherinfo/icons/weather-storm.svg
diff --git a/demos/embedded/weatherinfo/icons/weather-sunny-very-few-clouds.svg b/examples/embedded/weatherinfo/icons/weather-sunny-very-few-clouds.svg
index a27d30a..a27d30a 100644
--- a/demos/embedded/weatherinfo/icons/weather-sunny-very-few-clouds.svg
+++ b/examples/embedded/weatherinfo/icons/weather-sunny-very-few-clouds.svg
diff --git a/demos/embedded/weatherinfo/icons/weather-sunny.svg b/examples/embedded/weatherinfo/icons/weather-sunny.svg
index 248199c..248199c 100644
--- a/demos/embedded/weatherinfo/icons/weather-sunny.svg
+++ b/examples/embedded/weatherinfo/icons/weather-sunny.svg
diff --git a/demos/embedded/weatherinfo/icons/weather-thundershower.svg b/examples/embedded/weatherinfo/icons/weather-thundershower.svg
index e1c2286..e1c2286 100644
--- a/demos/embedded/weatherinfo/icons/weather-thundershower.svg
+++ b/examples/embedded/weatherinfo/icons/weather-thundershower.svg
diff --git a/demos/embedded/weatherinfo/weatherinfo.cpp b/examples/embedded/weatherinfo/weatherinfo.cpp
index 0614149..0614149 100644
--- a/demos/embedded/weatherinfo/weatherinfo.cpp
+++ b/examples/embedded/weatherinfo/weatherinfo.cpp
diff --git a/demos/embedded/weatherinfo/weatherinfo.pro b/examples/embedded/weatherinfo/weatherinfo.pro
index af803c9..58a7add 100644
--- a/demos/embedded/weatherinfo/weatherinfo.pro
+++ b/examples/embedded/weatherinfo/weatherinfo.pro
@@ -10,7 +10,7 @@ symbian {
     TARGET.CAPABILITY = NetworkServices
 }
 
-target.path = $$[QT_INSTALL_DEMOS]/qtsvg/embedded/weatherinfo
+target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/weatherinfo
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_DEMOS]/qtsvg/embedded/weatherinfo
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/weatherinfo
 INSTALLS += target sources
diff --git a/demos/embedded/weatherinfo/weatherinfo.qrc b/examples/embedded/weatherinfo/weatherinfo.qrc
index 6e9d224..6e9d224 100644
--- a/demos/embedded/weatherinfo/weatherinfo.qrc
+++ b/examples/embedded/weatherinfo/weatherinfo.qrc
diff --git a/examples/examples.pro b/examples/examples.pro
index 1806642..d64c5e5 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,4 +1,4 @@
 TEMPLATE = subdirs
-SUBDIRS += richtext draganddrop painting network desktop
+SUBDIRS += embedded richtext draganddrop painting network desktop
 
 contains(QT_CONFIG,opengl):SUBDIRS += opengl
diff --git a/qtsvg.pro b/qtsvg.pro
index 0ab7391..26250c2 100644
--- a/qtsvg.pro
+++ b/qtsvg.pro
@@ -10,13 +10,6 @@ module_qtsvg_examples.depends = module_qtsvg_src
     module_qtsvg_examples.CONFIG += no_default_install no_default_target
 }
 
-module_qtsvg_demos.subdir = demos
-module_qtsvg_demos.target = module-qtsvg-demos
-module_qtsvg_demos.depends = module_qtsvg_src
-!contains(QT_BUILD_PARTS,demos) {
-    module_qtsvg_demos.CONFIG += no_default_install no_default_target
-}
-
 module_qtsvg_tests.subdir = tests
 module_qtsvg_tests.target = module-qtsvg-tests
 module_qtsvg_tests.depends = module_qtsvg_src
@@ -25,6 +18,5 @@ module_qtsvg_tests.CONFIG = no_default_install
 
 SUBDIRS += module_qtsvg_src \
            module_qtsvg_examples \
-           module_qtsvg_demos \
            module_qtsvg_tests \