158 files changed, 122 insertions, 181 deletions

diff --git a/examples/draganddrop/delayedencoding/delayedencoding.pro b/examples/draganddrop/delayedencoding/delayedencoding.pro
deleted file mode 100644
index d0e6395..0000000
--- a/examples/draganddrop/delayedencoding/delayedencoding.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-QT          += svg
-
-HEADERS     = mimedata.h \
-              sourcewidget.h
-RESOURCES   = delayedencoding.qrc
-SOURCES     = main.cpp \
-              mimedata.cpp \
-              sourcewidget.cpp
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/draganddrop/delayedencoding
-sources.files = $$SOURCES $$HEADERS *.pro $$RESOURCES images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/draganddrop/delayedencoding
-INSTALLS += target sources
-
-simulator: warning(This example does not work on Simulator platform)
-QT+=widgets
diff --git a/examples/draganddrop/draganddrop.pro b/examples/draganddrop/draganddrop.pro
deleted file mode 100644
index 75e3e99..0000000
--- a/examples/draganddrop/draganddrop.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TEMPLATE = subdirs
-!contains(QT_CONFIG, no-widgets): SUBDIRS += delayedencoding
-QT+=widgets
-
-# install
-sources.files = draganddrop.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/draganddrop
-INSTALLS += sources
diff --git a/examples/embedded/embedded.pro b/examples/embedded/embedded.pro
deleted file mode 100644
index 07554b8..0000000
--- a/examples/embedded/embedded.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TEMPLATE = subdirs
-!contains(QT_CONFIG, no-widgets): SUBDIRS += desktopservices fluidlauncher weatherinfo
-QT+=widgets
-
-# install
-sources.files = embedded.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded
-INSTALLS += sources
diff --git a/examples/embedded/weatherinfo/weatherinfo.pro b/examples/embedded/weatherinfo/weatherinfo.pro
deleted file mode 100644
index 4bed5d0..0000000
--- a/examples/embedded/weatherinfo/weatherinfo.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-TARGET = weatherinfo
-SOURCES = weatherinfo.cpp
-RESOURCES = weatherinfo.qrc
-QT += network svg
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/weatherinfo
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro icons
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/weatherinfo
-INSTALLS += target sources
-QT+=widgets
diff --git a/examples/examples.pro b/examples/examples.pro
index 30b113c..a138e83 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,5 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS += embedded richtext draganddrop network svg
-
-contains(QT_CONFIG,opengl):!contains(QT_CONFIG,opengles2):SUBDIRS += opengl
-QT+=widgets
+SUBDIRS += svg
diff --git a/examples/network/network.pro b/examples/network/network.pro
deleted file mode 100644
index 0a65e40..0000000
--- a/examples/network/network.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TEMPLATE = subdirs
-!contains(QT_CONFIG, no-widgets): SUBDIRS += bearercloud
-QT+=widgets
-
-# install
-sources.files = network.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/network
-INSTALLS += sources
diff --git a/examples/opengl/framebufferobject/framebufferobject.pro b/examples/opengl/framebufferobject/framebufferobject.pro
deleted file mode 100644
index c53eb8a..0000000
--- a/examples/opengl/framebufferobject/framebufferobject.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-QT += widgets opengl svg
-
-HEADERS += glwidget.h
-SOURCES += glwidget.cpp main.cpp
-RESOURCES += framebufferobject.qrc
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/opengl/framebufferobject
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.png *.svg
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/opengl/framebufferobject
-INSTALLS += target sources
diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro
deleted file mode 100644
index 6f3d007..0000000
--- a/examples/opengl/opengl.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TEMPLATE = subdirs
-!contains(QT_CONFIG, no-widgets): SUBDIRS += framebufferobject
-QT+=widgets
-
-# install
-sources.files = opengl.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/opengl
-INSTALLS += sources
diff --git a/examples/richtext/richtext.pro b/examples/richtext/richtext.pro
deleted file mode 100644
index 4262d78..0000000
--- a/examples/richtext/richtext.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TEMPLATE = subdirs
-!contains(QT_CONFIG, no-widgets): SUBDIRS += textobject
-QT+=widgets
-
-# install
-sources.files = richtext.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/richtext
-INSTALLS += sources
diff --git a/examples/svg/draganddrop/delayedencoding/delayedencoding.pro b/examples/svg/draganddrop/delayedencoding/delayedencoding.pro
new file mode 100644
index 0000000..a0a8371
--- /dev/null
+++ b/examples/svg/draganddrop/delayedencoding/delayedencoding.pro
@@ -0,0 +1,14 @@
+QT          += widgets svg
+
+HEADERS     = mimedata.h \
+              sourcewidget.h
+RESOURCES   = delayedencoding.qrc
+SOURCES     = main.cpp \
+              mimedata.cpp \
+              sourcewidget.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/svg/draganddrop/delayedencoding
+INSTALLS += target
+
+simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/draganddrop/delayedencoding/delayedencoding.qrc b/examples/svg/draganddrop/delayedencoding/delayedencoding.qrc
index 374f211..374f211 100644
--- a/examples/draganddrop/delayedencoding/delayedencoding.qrc
+++ b/examples/svg/draganddrop/delayedencoding/delayedencoding.qrc
diff --git a/examples/draganddrop/delayedencoding/images/drag.png b/examples/svg/draganddrop/delayedencoding/images/drag.png
index dd795cf..dd795cf 100644
--- a/examples/draganddrop/delayedencoding/images/drag.png
+++ b/examples/svg/draganddrop/delayedencoding/images/drag.png
diff --git a/examples/draganddrop/delayedencoding/images/example.svg b/examples/svg/draganddrop/delayedencoding/images/example.svg
index 89a9129..7ae3ef5 100644
--- a/examples/draganddrop/delayedencoding/images/example.svg
+++ b/examples/svg/draganddrop/delayedencoding/images/example.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" standalone="no"?>
 <!-- ***********************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/draganddrop/delayedencoding/main.cpp b/examples/svg/draganddrop/delayedencoding/main.cpp
index 6b6063b..0aed1b2 100644
--- a/examples/draganddrop/delayedencoding/main.cpp
+++ b/examples/svg/draganddrop/delayedencoding/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/draganddrop/delayedencoding/mimedata.cpp b/examples/svg/draganddrop/delayedencoding/mimedata.cpp
index efa096e..080776a 100644
--- a/examples/draganddrop/delayedencoding/mimedata.cpp
+++ b/examples/svg/draganddrop/delayedencoding/mimedata.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/draganddrop/delayedencoding/mimedata.h b/examples/svg/draganddrop/delayedencoding/mimedata.h
index 4d84bd0..1a5bd98 100644
--- a/examples/draganddrop/delayedencoding/mimedata.h
+++ b/examples/svg/draganddrop/delayedencoding/mimedata.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/draganddrop/delayedencoding/sourcewidget.cpp b/examples/svg/draganddrop/delayedencoding/sourcewidget.cpp
index 0373edb..0e20461 100644
--- a/examples/draganddrop/delayedencoding/sourcewidget.cpp
+++ b/examples/svg/draganddrop/delayedencoding/sourcewidget.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/draganddrop/delayedencoding/sourcewidget.h b/examples/svg/draganddrop/delayedencoding/sourcewidget.h
index ef2766a..b0f0383 100644
--- a/examples/draganddrop/delayedencoding/sourcewidget.h
+++ b/examples/svg/draganddrop/delayedencoding/sourcewidget.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/draganddrop/draganddrop.pro b/examples/svg/draganddrop/draganddrop.pro
new file mode 100644
index 0000000..554e4d3
--- /dev/null
+++ b/examples/svg/draganddrop/draganddrop.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+qtHaveModule(widgets): SUBDIRS += delayedencoding
diff --git a/examples/embedded/desktopservices/contenttab.cpp b/examples/svg/embedded/desktopservices/contenttab.cpp
index 5c82611..172ea9e 100644
--- a/examples/embedded/desktopservices/contenttab.cpp
+++ b/examples/svg/embedded/desktopservices/contenttab.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/embedded/desktopservices/contenttab.h b/examples/svg/embedded/desktopservices/contenttab.h
index 9f0a824..8162f38 100644
--- a/examples/embedded/desktopservices/contenttab.h
+++ b/examples/svg/embedded/desktopservices/contenttab.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/embedded/desktopservices/data/Explosion.wav b/examples/svg/embedded/desktopservices/data/Explosion.wav
index 7b140b1..7b140b1 100644
--- a/examples/embedded/desktopservices/data/Explosion.wav
+++ b/examples/svg/embedded/desktopservices/data/Explosion.wav
diff --git a/examples/embedded/desktopservices/data/designer.png b/examples/svg/embedded/desktopservices/data/designer.png
index 1485efa..1485efa 100644
--- a/examples/embedded/desktopservices/data/designer.png
+++ b/examples/svg/embedded/desktopservices/data/designer.png
diff --git a/examples/embedded/desktopservices/data/monkey_on_64x64.png b/examples/svg/embedded/desktopservices/data/monkey_on_64x64.png
index 990f604..990f604 100644
--- a/examples/embedded/desktopservices/data/monkey_on_64x64.png
+++ b/examples/svg/embedded/desktopservices/data/monkey_on_64x64.png
diff --git a/examples/embedded/desktopservices/data/sax.mp3 b/examples/svg/embedded/desktopservices/data/sax.mp3
index d77c817..d77c817 100644
--- a/examples/embedded/desktopservices/data/sax.mp3
+++ b/examples/svg/embedded/desktopservices/data/sax.mp3
diff --git a/examples/embedded/desktopservices/desktopservices.pro b/examples/svg/embedded/desktopservices/desktopservices.pro
index c8fc140..1410451 100644
--- a/examples/embedded/desktopservices/desktopservices.pro
+++ b/examples/svg/embedded/desktopservices/desktopservices.pro
@@ -5,12 +5,12 @@ SOURCES += desktopwidget.cpp contenttab.cpp linktab.cpp main.cpp
 
 RESOURCES += desktopservices.qrc
 
+EXAMPLE_FILES += data
+
 music.files = data/*.mp3 data/*.wav
 image.files = data/*.png
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/desktopservices
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro resources data
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/desktopservices
+target.path = $$[QT_INSTALL_EXAMPLES]/svg/embedded/desktopservices
 
 wince*{
     music.path = "\\My Documents\\My Music"
@@ -18,4 +18,4 @@ wince*{
     DEPLOYMENT += music image
 }
 
-INSTALLS += target sources
+INSTALLS += target
diff --git a/examples/embedded/desktopservices/desktopservices.qrc b/examples/svg/embedded/desktopservices/desktopservices.qrc
index 410175f..410175f 100644
--- a/examples/embedded/desktopservices/desktopservices.qrc
+++ b/examples/svg/embedded/desktopservices/desktopservices.qrc
diff --git a/examples/embedded/desktopservices/desktopwidget.cpp b/examples/svg/embedded/desktopservices/desktopwidget.cpp
index 75cc249..7a26443 100644
--- a/examples/embedded/desktopservices/desktopwidget.cpp
+++ b/examples/svg/embedded/desktopservices/desktopwidget.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/embedded/desktopservices/desktopwidget.h b/examples/svg/embedded/desktopservices/desktopwidget.h
index 6c1539c..6c5c667 100644
--- a/examples/embedded/desktopservices/desktopwidget.h
+++ b/examples/svg/embedded/desktopservices/desktopwidget.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/embedded/desktopservices/linktab.cpp b/examples/svg/embedded/desktopservices/linktab.cpp
index 523a104..f710c95 100644
--- a/examples/embedded/desktopservices/linktab.cpp
+++ b/examples/svg/embedded/desktopservices/linktab.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/embedded/desktopservices/linktab.h b/examples/svg/embedded/desktopservices/linktab.h
index 8d13475..3b7e9b4 100644
--- a/examples/embedded/desktopservices/linktab.h
+++ b/examples/svg/embedded/desktopservices/linktab.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/embedded/desktopservices/main.cpp b/examples/svg/embedded/desktopservices/main.cpp
index 878d589..e135800 100644
--- a/examples/embedded/desktopservices/main.cpp
+++ b/examples/svg/embedded/desktopservices/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/embedded/desktopservices/resources/browser.png b/examples/svg/embedded/desktopservices/resources/browser.png
index 9ecda6b..9ecda6b 100644
--- a/examples/embedded/desktopservices/resources/browser.png
+++ b/examples/svg/embedded/desktopservices/resources/browser.png
diff --git a/examples/embedded/desktopservices/resources/heart.svg b/examples/svg/embedded/desktopservices/resources/heart.svg
index ba5f050..ba5f050 100644
--- a/examples/embedded/desktopservices/resources/heart.svg
+++ b/examples/svg/embedded/desktopservices/resources/heart.svg
diff --git a/examples/embedded/desktopservices/resources/message.png b/examples/svg/embedded/desktopservices/resources/message.png
index 78917c7..78917c7 100644
--- a/examples/embedded/desktopservices/resources/message.png
+++ b/examples/svg/embedded/desktopservices/resources/message.png
diff --git a/examples/embedded/desktopservices/resources/music.png b/examples/svg/embedded/desktopservices/resources/music.png
index cc569cb..cc569cb 100644
--- a/examples/embedded/desktopservices/resources/music.png
+++ b/examples/svg/embedded/desktopservices/resources/music.png
diff --git a/examples/embedded/desktopservices/resources/photo.png b/examples/svg/embedded/desktopservices/resources/photo.png
index ac81cf3..ac81cf3 100644
--- a/examples/embedded/desktopservices/resources/photo.png
+++ b/examples/svg/embedded/desktopservices/resources/photo.png
diff --git a/examples/svg/embedded/embedded.pro b/examples/svg/embedded/embedded.pro
new file mode 100644
index 0000000..9545cc4
--- /dev/null
+++ b/examples/svg/embedded/embedded.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+qtHaveModule(widgets): SUBDIRS += desktopservices fluidlauncher weatherinfo
diff --git a/examples/embedded/fluidlauncher/backup_registration.xml b/examples/svg/embedded/fluidlauncher/backup_registration.xml
index 794e11d..794e11d 100644
--- a/examples/embedded/fluidlauncher/backup_registration.xml
+++ b/examples/svg/embedded/fluidlauncher/backup_registration.xml
diff --git a/examples/embedded/fluidlauncher/config.xml b/examples/svg/embedded/fluidlauncher/config.xml
index 6cb4be7..6cb4be7 100644
--- a/examples/embedded/fluidlauncher/config.xml
+++ b/examples/svg/embedded/fluidlauncher/config.xml
diff --git a/examples/embedded/fluidlauncher/config_s60/config.xml b/examples/svg/embedded/fluidlauncher/config_s60/config.xml
index 4f10488..4f10488 100644
--- a/examples/embedded/fluidlauncher/config_s60/config.xml
+++ b/examples/svg/embedded/fluidlauncher/config_s60/config.xml
diff --git a/examples/embedded/fluidlauncher/config_wince/config.xml b/examples/svg/embedded/fluidlauncher/config_wince/config.xml
index 3b57770..3b57770 100644
--- a/examples/embedded/fluidlauncher/config_wince/config.xml
+++ b/examples/svg/embedded/fluidlauncher/config_wince/config.xml
diff --git a/examples/embedded/fluidlauncher/demoapplication.cpp b/examples/svg/embedded/fluidlauncher/demoapplication.cpp
index 96af4ae..ea7f5d6 100644
--- a/examples/embedded/fluidlauncher/demoapplication.cpp
+++ b/examples/svg/embedded/fluidlauncher/demoapplication.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/embedded/fluidlauncher/demoapplication.h b/examples/svg/embedded/fluidlauncher/demoapplication.h
index 20d22ac..da12f05 100644
--- a/examples/embedded/fluidlauncher/demoapplication.h
+++ b/examples/svg/embedded/fluidlauncher/demoapplication.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/embedded/fluidlauncher/fluidlauncher.cpp b/examples/svg/embedded/fluidlauncher/fluidlauncher.cpp
index 60e788c..a5af617 100644
--- a/examples/embedded/fluidlauncher/fluidlauncher.cpp
+++ b/examples/svg/embedded/fluidlauncher/fluidlauncher.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/embedded/fluidlauncher/fluidlauncher.h b/examples/svg/embedded/fluidlauncher/fluidlauncher.h
index 8278971..6fee1e1 100644
--- a/examples/embedded/fluidlauncher/fluidlauncher.h
+++ b/examples/svg/embedded/fluidlauncher/fluidlauncher.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/embedded/fluidlauncher/fluidlauncher.pro b/examples/svg/embedded/fluidlauncher/fluidlauncher.pro
index 7ea5edc..f2d4b60 100644
--- a/examples/embedded/fluidlauncher/fluidlauncher.pro
+++ b/examples/svg/embedded/fluidlauncher/fluidlauncher.pro
@@ -15,11 +15,10 @@ SOURCES += \
            pictureflow.cpp \
            slideshow.cpp
 
+EXAMPLE_FILES += config.xml screenshots slides
 
-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
+target.path = $$[QT_INSTALL_EXAMPLES]/svg/embedded/fluidlauncher
+INSTALLS += target
 
 wince*{
     QT += svg
@@ -29,10 +28,12 @@ wince*{
         BUILD_DIR = debug
     }
 
-    baseex = $$shadowed($$QT.qtbase.sources/../../examples)
-    svgex = $$shadowed($$QT.qtsvg.sources/../../examples)
+    requires(!isEmpty(_QMAKE_SUPER_CACHE_))
+    base = $$dirname(_QMAKE_SUPER_CACHE_)
+    baseex = $$base/qtbase/examples
+    svgex = $$base/qtsvg/examples
     executables.files = \
-        $$svgex/embedded/embeddedsvgviewer/$${BUILD_DIR}/embeddedsvgviewer.exe \
+        $$svgex/svg/embedded/embeddedsvgviewer/$${BUILD_DIR}/embeddedsvgviewer.exe \
         $$baseex/embedded/styleexample/$${BUILD_DIR}/styleexample.exe \
         $$baseex/painting/deform/$${BUILD_DIR}/deform.exe \
         $$baseex/painting/pathstroke/$${BUILD_DIR}/pathstroke.exe \
diff --git a/examples/embedded/fluidlauncher/main.cpp b/examples/svg/embedded/fluidlauncher/main.cpp
index 565face..d8078cc 100644
--- a/examples/embedded/fluidlauncher/main.cpp
+++ b/examples/svg/embedded/fluidlauncher/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/embedded/fluidlauncher/pictureflow.cpp b/examples/svg/embedded/fluidlauncher/pictureflow.cpp
index d0dfe87..eb963f7 100644
--- a/examples/embedded/fluidlauncher/pictureflow.cpp
+++ b/examples/svg/embedded/fluidlauncher/pictureflow.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the ActiveQt framework of the Qt Toolkit.
diff --git a/examples/embedded/fluidlauncher/pictureflow.h b/examples/svg/embedded/fluidlauncher/pictureflow.h
index 13e676b..a72099d 100644
--- a/examples/embedded/fluidlauncher/pictureflow.h
+++ b/examples/svg/embedded/fluidlauncher/pictureflow.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the ActiveQt framework of the Qt Toolkit.
diff --git a/examples/embedded/fluidlauncher/screenshots/anomaly_s60.png b/examples/svg/embedded/fluidlauncher/screenshots/anomaly_s60.png
index 8d537f4..8d537f4 100644
--- a/examples/embedded/fluidlauncher/screenshots/anomaly_s60.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/anomaly_s60.png
diff --git a/examples/embedded/fluidlauncher/screenshots/concentriccircles.png b/examples/svg/embedded/fluidlauncher/screenshots/concentriccircles.png
index fd308b5..fd308b5 100644
--- a/examples/embedded/fluidlauncher/screenshots/concentriccircles.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/concentriccircles.png
diff --git a/examples/embedded/fluidlauncher/screenshots/context2d_s60.png b/examples/svg/embedded/fluidlauncher/screenshots/context2d_s60.png
index 9c288c9..9c288c9 100644
--- a/examples/embedded/fluidlauncher/screenshots/context2d_s60.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/context2d_s60.png
diff --git a/examples/embedded/fluidlauncher/screenshots/deform.png b/examples/svg/embedded/fluidlauncher/screenshots/deform.png
index c22f2ae..c22f2ae 100644
--- a/examples/embedded/fluidlauncher/screenshots/deform.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/deform.png
diff --git a/examples/embedded/fluidlauncher/screenshots/desktopservices_s60.png b/examples/svg/embedded/fluidlauncher/screenshots/desktopservices_s60.png
index 64018f4..64018f4 100644
--- a/examples/embedded/fluidlauncher/screenshots/desktopservices_s60.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/desktopservices_s60.png
diff --git a/examples/embedded/fluidlauncher/screenshots/digiflip.png b/examples/svg/embedded/fluidlauncher/screenshots/digiflip.png
index c31a6f8..c31a6f8 100644
--- a/examples/embedded/fluidlauncher/screenshots/digiflip.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/digiflip.png
diff --git a/examples/embedded/fluidlauncher/screenshots/elasticnodes.png b/examples/svg/embedded/fluidlauncher/screenshots/elasticnodes.png
index bc157e5..bc157e5 100644
--- a/examples/embedded/fluidlauncher/screenshots/elasticnodes.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/elasticnodes.png
diff --git a/examples/embedded/fluidlauncher/screenshots/embeddedsvgviewer.png b/examples/svg/embedded/fluidlauncher/screenshots/embeddedsvgviewer.png
index 522f13b..522f13b 100644
--- a/examples/embedded/fluidlauncher/screenshots/embeddedsvgviewer.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/embeddedsvgviewer.png
diff --git a/examples/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png b/examples/svg/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png
index 74f4ad1..74f4ad1 100644
--- a/examples/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png
diff --git a/examples/embedded/fluidlauncher/screenshots/flickable.png b/examples/svg/embedded/fluidlauncher/screenshots/flickable.png
index bad14bf..bad14bf 100644
--- a/examples/embedded/fluidlauncher/screenshots/flickable.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/flickable.png
diff --git a/examples/embedded/fluidlauncher/screenshots/flightinfo_s60.png b/examples/svg/embedded/fluidlauncher/screenshots/flightinfo_s60.png
index 8e74d77..8e74d77 100644
--- a/examples/embedded/fluidlauncher/screenshots/flightinfo_s60.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/flightinfo_s60.png
diff --git a/examples/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png b/examples/svg/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png
index d31875d..d31875d 100644
--- a/examples/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png
diff --git a/examples/embedded/fluidlauncher/screenshots/ftp_s60.png b/examples/svg/embedded/fluidlauncher/screenshots/ftp_s60.png
index 5858daf..5858daf 100644
--- a/examples/embedded/fluidlauncher/screenshots/ftp_s60.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/ftp_s60.png
diff --git a/examples/embedded/fluidlauncher/screenshots/lightmaps.png b/examples/svg/embedded/fluidlauncher/screenshots/lightmaps.png
index 18aa74d..18aa74d 100644
--- a/examples/embedded/fluidlauncher/screenshots/lightmaps.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/lightmaps.png
diff --git a/examples/embedded/fluidlauncher/screenshots/mediaplayer.png b/examples/svg/embedded/fluidlauncher/screenshots/mediaplayer.png
index c9fd43c..c9fd43c 100644
--- a/examples/embedded/fluidlauncher/screenshots/mediaplayer.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/mediaplayer.png
diff --git a/examples/embedded/fluidlauncher/screenshots/pathstroke.png b/examples/svg/embedded/fluidlauncher/screenshots/pathstroke.png
index c3d727e..c3d727e 100644
--- a/examples/embedded/fluidlauncher/screenshots/pathstroke.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/pathstroke.png
diff --git a/examples/embedded/fluidlauncher/screenshots/qmlcalculator.png b/examples/svg/embedded/fluidlauncher/screenshots/qmlcalculator.png
index f4218f5..f4218f5 100644
--- a/examples/embedded/fluidlauncher/screenshots/qmlcalculator.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/qmlcalculator.png
diff --git a/examples/embedded/fluidlauncher/screenshots/qmlclocks.png b/examples/svg/embedded/fluidlauncher/screenshots/qmlclocks.png
index ba25a18..ba25a18 100644
--- a/examples/embedded/fluidlauncher/screenshots/qmlclocks.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/qmlclocks.png
diff --git a/examples/embedded/fluidlauncher/screenshots/qmldialcontrol.png b/examples/svg/embedded/fluidlauncher/screenshots/qmldialcontrol.png
index b8def8c..b8def8c 100644
--- a/examples/embedded/fluidlauncher/screenshots/qmldialcontrol.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/qmldialcontrol.png
diff --git a/examples/embedded/fluidlauncher/screenshots/qmleasing.png b/examples/svg/embedded/fluidlauncher/screenshots/qmleasing.png
index d34c2ac..d34c2ac 100644
--- a/examples/embedded/fluidlauncher/screenshots/qmleasing.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/qmleasing.png
diff --git a/examples/embedded/fluidlauncher/screenshots/qmlflickr.jpg b/examples/svg/embedded/fluidlauncher/screenshots/qmlflickr.jpg
index d7faabf..d7faabf 100644
--- a/examples/embedded/fluidlauncher/screenshots/qmlflickr.jpg
+++ b/examples/svg/embedded/fluidlauncher/screenshots/qmlflickr.jpg
diff --git a/examples/embedded/fluidlauncher/screenshots/qmlphotoviewer.jpg b/examples/svg/embedded/fluidlauncher/screenshots/qmlphotoviewer.jpg
index 673ffc6..673ffc6 100644
--- a/examples/embedded/fluidlauncher/screenshots/qmlphotoviewer.jpg
+++ b/examples/svg/embedded/fluidlauncher/screenshots/qmlphotoviewer.jpg
diff --git a/examples/embedded/fluidlauncher/screenshots/qmltwitter.jpg b/examples/svg/embedded/fluidlauncher/screenshots/qmltwitter.jpg
index 4399eea..4399eea 100644
--- a/examples/embedded/fluidlauncher/screenshots/qmltwitter.jpg
+++ b/examples/svg/embedded/fluidlauncher/screenshots/qmltwitter.jpg
diff --git a/examples/embedded/fluidlauncher/screenshots/raycasting.png b/examples/svg/embedded/fluidlauncher/screenshots/raycasting.png
index b6b738a..b6b738a 100644
--- a/examples/embedded/fluidlauncher/screenshots/raycasting.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/raycasting.png
diff --git a/examples/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png b/examples/svg/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png
index 54b6321..54b6321 100644
--- a/examples/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png
diff --git a/examples/embedded/fluidlauncher/screenshots/softkeys_s60.png b/examples/svg/embedded/fluidlauncher/screenshots/softkeys_s60.png
index df090e2..df090e2 100644
--- a/examples/embedded/fluidlauncher/screenshots/softkeys_s60.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/softkeys_s60.png
diff --git a/examples/embedded/fluidlauncher/screenshots/spectrum.png b/examples/svg/embedded/fluidlauncher/screenshots/spectrum.png
index 7f4938f..7f4938f 100644
--- a/examples/embedded/fluidlauncher/screenshots/spectrum.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/spectrum.png
diff --git a/examples/embedded/fluidlauncher/screenshots/styledemo.png b/examples/svg/embedded/fluidlauncher/screenshots/styledemo.png
index 669c488..669c488 100644
--- a/examples/embedded/fluidlauncher/screenshots/styledemo.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/styledemo.png
diff --git a/examples/embedded/fluidlauncher/screenshots/styledemo_s60.png b/examples/svg/embedded/fluidlauncher/screenshots/styledemo_s60.png
index 57480fb..57480fb 100644
--- a/examples/embedded/fluidlauncher/screenshots/styledemo_s60.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/styledemo_s60.png
diff --git a/examples/embedded/fluidlauncher/screenshots/weatherinfo.png b/examples/svg/embedded/fluidlauncher/screenshots/weatherinfo.png
index 7e23891..7e23891 100644
--- a/examples/embedded/fluidlauncher/screenshots/weatherinfo.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/weatherinfo.png
diff --git a/examples/embedded/fluidlauncher/screenshots/wiggly.png b/examples/svg/embedded/fluidlauncher/screenshots/wiggly.png
index b20fbc4..b20fbc4 100644
--- a/examples/embedded/fluidlauncher/screenshots/wiggly.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/wiggly.png
diff --git a/examples/embedded/fluidlauncher/screenshots/wiggly_s60.png b/examples/svg/embedded/fluidlauncher/screenshots/wiggly_s60.png
index 9c4cab3..9c4cab3 100644
--- a/examples/embedded/fluidlauncher/screenshots/wiggly_s60.png
+++ b/examples/svg/embedded/fluidlauncher/screenshots/wiggly_s60.png
diff --git a/examples/embedded/fluidlauncher/slides/demo_1.png b/examples/svg/embedded/fluidlauncher/slides/demo_1.png
index d53d19d..d53d19d 100644
--- a/examples/embedded/fluidlauncher/slides/demo_1.png
+++ b/examples/svg/embedded/fluidlauncher/slides/demo_1.png
diff --git a/examples/embedded/fluidlauncher/slides/demo_2.png b/examples/svg/embedded/fluidlauncher/slides/demo_2.png
index f137de0..f137de0 100644
--- a/examples/embedded/fluidlauncher/slides/demo_2.png
+++ b/examples/svg/embedded/fluidlauncher/slides/demo_2.png
diff --git a/examples/embedded/fluidlauncher/slides/demo_3.png b/examples/svg/embedded/fluidlauncher/slides/demo_3.png
index 8369bc0..8369bc0 100644
--- a/examples/embedded/fluidlauncher/slides/demo_3.png
+++ b/examples/svg/embedded/fluidlauncher/slides/demo_3.png
diff --git a/examples/embedded/fluidlauncher/slides/demo_4.png b/examples/svg/embedded/fluidlauncher/slides/demo_4.png
index 377e369..377e369 100644
--- a/examples/embedded/fluidlauncher/slides/demo_4.png
+++ b/examples/svg/embedded/fluidlauncher/slides/demo_4.png
diff --git a/examples/embedded/fluidlauncher/slides/demo_5.png b/examples/svg/embedded/fluidlauncher/slides/demo_5.png
index 0bb1781..0bb1781 100644
--- a/examples/embedded/fluidlauncher/slides/demo_5.png
+++ b/examples/svg/embedded/fluidlauncher/slides/demo_5.png
diff --git a/examples/embedded/fluidlauncher/slides/demo_6.png b/examples/svg/embedded/fluidlauncher/slides/demo_6.png
index 9daba67..9daba67 100644
--- a/examples/embedded/fluidlauncher/slides/demo_6.png
+++ b/examples/svg/embedded/fluidlauncher/slides/demo_6.png
diff --git a/examples/embedded/fluidlauncher/slideshow.cpp b/examples/svg/embedded/fluidlauncher/slideshow.cpp
index 5a3da0d..608a9f1 100644
--- a/examples/embedded/fluidlauncher/slideshow.cpp
+++ b/examples/svg/embedded/fluidlauncher/slideshow.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/embedded/fluidlauncher/slideshow.h b/examples/svg/embedded/fluidlauncher/slideshow.h
index 2ebc6a2..7f91268 100644
--- a/examples/embedded/fluidlauncher/slideshow.h
+++ b/examples/svg/embedded/fluidlauncher/slideshow.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/embedded/weatherinfo/icons/README.txt b/examples/svg/embedded/weatherinfo/icons/README.txt
index d384153..d384153 100644
--- a/examples/embedded/weatherinfo/icons/README.txt
+++ b/examples/svg/embedded/weatherinfo/icons/README.txt
diff --git a/examples/embedded/weatherinfo/icons/weather-few-clouds.svg b/examples/svg/embedded/weatherinfo/icons/weather-few-clouds.svg
index a53e3d6..a53e3d6 100644
--- a/examples/embedded/weatherinfo/icons/weather-few-clouds.svg
+++ b/examples/svg/embedded/weatherinfo/icons/weather-few-clouds.svg
diff --git a/examples/embedded/weatherinfo/icons/weather-fog.svg b/examples/svg/embedded/weatherinfo/icons/weather-fog.svg
index 56a2444..56a2444 100644
--- a/examples/embedded/weatherinfo/icons/weather-fog.svg
+++ b/examples/svg/embedded/weatherinfo/icons/weather-fog.svg
diff --git a/examples/embedded/weatherinfo/icons/weather-haze.svg b/examples/svg/embedded/weatherinfo/icons/weather-haze.svg
index b31811f..b31811f 100644
--- a/examples/embedded/weatherinfo/icons/weather-haze.svg
+++ b/examples/svg/embedded/weatherinfo/icons/weather-haze.svg
diff --git a/examples/embedded/weatherinfo/icons/weather-icy.svg b/examples/svg/embedded/weatherinfo/icons/weather-icy.svg
index 2c45b33..2c45b33 100644
--- a/examples/embedded/weatherinfo/icons/weather-icy.svg
+++ b/examples/svg/embedded/weatherinfo/icons/weather-icy.svg
diff --git a/examples/embedded/weatherinfo/icons/weather-overcast.svg b/examples/svg/embedded/weatherinfo/icons/weather-overcast.svg
index cf77214..cf77214 100644
--- a/examples/embedded/weatherinfo/icons/weather-overcast.svg
+++ b/examples/svg/embedded/weatherinfo/icons/weather-overcast.svg
diff --git a/examples/embedded/weatherinfo/icons/weather-showers.svg b/examples/svg/embedded/weatherinfo/icons/weather-showers.svg
index 017665d..017665d 100644
--- a/examples/embedded/weatherinfo/icons/weather-showers.svg
+++ b/examples/svg/embedded/weatherinfo/icons/weather-showers.svg
diff --git a/examples/embedded/weatherinfo/icons/weather-sleet.svg b/examples/svg/embedded/weatherinfo/icons/weather-sleet.svg
index bf2306f..bf2306f 100644
--- a/examples/embedded/weatherinfo/icons/weather-sleet.svg
+++ b/examples/svg/embedded/weatherinfo/icons/weather-sleet.svg
diff --git a/examples/embedded/weatherinfo/icons/weather-snow.svg b/examples/svg/embedded/weatherinfo/icons/weather-snow.svg
index a91946f..a91946f 100644
--- a/examples/embedded/weatherinfo/icons/weather-snow.svg
+++ b/examples/svg/embedded/weatherinfo/icons/weather-snow.svg
diff --git a/examples/embedded/weatherinfo/icons/weather-storm.svg b/examples/svg/embedded/weatherinfo/icons/weather-storm.svg
index 1ad47ab..1ad47ab 100644
--- a/examples/embedded/weatherinfo/icons/weather-storm.svg
+++ b/examples/svg/embedded/weatherinfo/icons/weather-storm.svg
diff --git a/examples/embedded/weatherinfo/icons/weather-sunny-very-few-clouds.svg b/examples/svg/embedded/weatherinfo/icons/weather-sunny-very-few-clouds.svg
index a27d30a..a27d30a 100644
--- a/examples/embedded/weatherinfo/icons/weather-sunny-very-few-clouds.svg
+++ b/examples/svg/embedded/weatherinfo/icons/weather-sunny-very-few-clouds.svg
diff --git a/examples/embedded/weatherinfo/icons/weather-sunny.svg b/examples/svg/embedded/weatherinfo/icons/weather-sunny.svg
index 248199c..248199c 100644
--- a/examples/embedded/weatherinfo/icons/weather-sunny.svg
+++ b/examples/svg/embedded/weatherinfo/icons/weather-sunny.svg
diff --git a/examples/embedded/weatherinfo/icons/weather-thundershower.svg b/examples/svg/embedded/weatherinfo/icons/weather-thundershower.svg
index e1c2286..e1c2286 100644
--- a/examples/embedded/weatherinfo/icons/weather-thundershower.svg
+++ b/examples/svg/embedded/weatherinfo/icons/weather-thundershower.svg
diff --git a/examples/embedded/weatherinfo/weatherinfo.cpp b/examples/svg/embedded/weatherinfo/weatherinfo.cpp
index 3648309..3425819 100644
--- a/examples/embedded/weatherinfo/weatherinfo.cpp
+++ b/examples/svg/embedded/weatherinfo/weatherinfo.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/svg/embedded/weatherinfo/weatherinfo.pro b/examples/svg/embedded/weatherinfo/weatherinfo.pro
new file mode 100644
index 0000000..b2c94cf
--- /dev/null
+++ b/examples/svg/embedded/weatherinfo/weatherinfo.pro
@@ -0,0 +1,8 @@
+TEMPLATE = app
+TARGET = weatherinfo
+SOURCES = weatherinfo.cpp
+RESOURCES = weatherinfo.qrc
+QT += network widgets svg
+
+target.path = $$[QT_INSTALL_EXAMPLES]/svg/embedded/weatherinfo
+INSTALLS += target
diff --git a/examples/embedded/weatherinfo/weatherinfo.qrc b/examples/svg/embedded/weatherinfo/weatherinfo.qrc
index 6e9d224..6e9d224 100644
--- a/examples/embedded/weatherinfo/weatherinfo.qrc
+++ b/examples/svg/embedded/weatherinfo/weatherinfo.qrc
diff --git a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.cpp b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.cpp
index a10910e..7e6dc47 100644
--- a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.cpp
+++ b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.h b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.h
index 18c5eaa..7ead063 100644
--- a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.h
+++ b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro
index 2445f96..40d4a6c 100644
--- a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro
+++ b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro
@@ -5,10 +5,8 @@ HEADERS += embeddedsvgviewer.h
 SOURCES += embeddedsvgviewer.cpp main.cpp
 RESOURCES += embeddedsvgviewer.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg/embeddedsvgviewer
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.svg files
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg/embeddedsvgviewer
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/svg/embeddedsvgviewer
+INSTALLS += target
 
 wince* {
    DEPLOYMENT_PLUGIN += qsvg
diff --git a/examples/svg/embeddedsvgviewer/main.cpp b/examples/svg/embeddedsvgviewer/main.cpp
index 287e2a5..40c3cfd 100644
--- a/examples/svg/embeddedsvgviewer/main.cpp
+++ b/examples/svg/embeddedsvgviewer/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/network/bearercloud/bearercloud.cpp b/examples/svg/network/bearercloud/bearercloud.cpp
index 02b6c50..b2e9b9b 100644
--- a/examples/network/bearercloud/bearercloud.cpp
+++ b/examples/svg/network/bearercloud/bearercloud.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/network/bearercloud/bearercloud.h b/examples/svg/network/bearercloud/bearercloud.h
index cd8e45e..277c904 100644
--- a/examples/network/bearercloud/bearercloud.h
+++ b/examples/svg/network/bearercloud/bearercloud.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/network/bearercloud/bearercloud.pro b/examples/svg/network/bearercloud/bearercloud.pro
index a993e23..723c8c7 100644
--- a/examples/network/bearercloud/bearercloud.pro
+++ b/examples/svg/network/bearercloud/bearercloud.pro
@@ -14,7 +14,5 @@ QT = core gui widgets network svg
 CONFIG += console
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/network/bearercloud
-sources.files = $$SOURCES $$HEADERS *.pro $$RESOURCES *.svg
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/network/bearercloud
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/svg/network/bearercloud
+INSTALLS += target
diff --git a/examples/network/bearercloud/bluetooth.svg b/examples/svg/network/bearercloud/bluetooth.svg
index 32e2fa3..32e2fa3 100644
--- a/examples/network/bearercloud/bluetooth.svg
+++ b/examples/svg/network/bearercloud/bluetooth.svg
diff --git a/examples/network/bearercloud/cell.svg b/examples/svg/network/bearercloud/cell.svg
index 7519868..7519868 100644
--- a/examples/network/bearercloud/cell.svg
+++ b/examples/svg/network/bearercloud/cell.svg
diff --git a/examples/network/bearercloud/cloud.cpp b/examples/svg/network/bearercloud/cloud.cpp
index 0531ad2..df2922a 100644
--- a/examples/network/bearercloud/cloud.cpp
+++ b/examples/svg/network/bearercloud/cloud.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/network/bearercloud/cloud.h b/examples/svg/network/bearercloud/cloud.h
index 1756b81..ec29d46 100644
--- a/examples/network/bearercloud/cloud.h
+++ b/examples/svg/network/bearercloud/cloud.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/network/bearercloud/gprs.svg b/examples/svg/network/bearercloud/gprs.svg
index 4a992c1..4a992c1 100644
--- a/examples/network/bearercloud/gprs.svg
+++ b/examples/svg/network/bearercloud/gprs.svg
diff --git a/examples/network/bearercloud/icons.qrc b/examples/svg/network/bearercloud/icons.qrc
index 7dea1f2..7dea1f2 100644
--- a/examples/network/bearercloud/icons.qrc
+++ b/examples/svg/network/bearercloud/icons.qrc
diff --git a/examples/network/bearercloud/lan.svg b/examples/svg/network/bearercloud/lan.svg
index 4f7f63d..4f7f63d 100755
--- a/examples/network/bearercloud/lan.svg
+++ b/examples/svg/network/bearercloud/lan.svg
diff --git a/examples/network/bearercloud/main.cpp b/examples/svg/network/bearercloud/main.cpp
index b81bca8..bd74c8c 100644
--- a/examples/network/bearercloud/main.cpp
+++ b/examples/svg/network/bearercloud/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/network/bearercloud/umts.svg b/examples/svg/network/bearercloud/umts.svg
index c1b372e..c1b372e 100644
--- a/examples/network/bearercloud/umts.svg
+++ b/examples/svg/network/bearercloud/umts.svg
diff --git a/examples/network/bearercloud/unknown.svg b/examples/svg/network/bearercloud/unknown.svg
index fd10298..fd10298 100644
--- a/examples/network/bearercloud/unknown.svg
+++ b/examples/svg/network/bearercloud/unknown.svg
diff --git a/examples/network/bearercloud/wlan.svg b/examples/svg/network/bearercloud/wlan.svg
index 8b86089..8b86089 100644
--- a/examples/network/bearercloud/wlan.svg
+++ b/examples/svg/network/bearercloud/wlan.svg
diff --git a/examples/svg/network/network.pro b/examples/svg/network/network.pro
new file mode 100644
index 0000000..cd3cc86
--- /dev/null
+++ b/examples/svg/network/network.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+qtHaveModule(widgets): SUBDIRS += bearercloud
diff --git a/examples/opengl/framebufferobject/bubbles.svg b/examples/svg/opengl/framebufferobject/bubbles.svg
index 5173012..5173012 100644
--- a/examples/opengl/framebufferobject/bubbles.svg
+++ b/examples/svg/opengl/framebufferobject/bubbles.svg
diff --git a/examples/opengl/framebufferobject/designer.png b/examples/svg/opengl/framebufferobject/designer.png
index 4f32d57..4f32d57 100644
--- a/examples/opengl/framebufferobject/designer.png
+++ b/examples/svg/opengl/framebufferobject/designer.png
diff --git a/examples/svg/opengl/framebufferobject/framebufferobject.pro b/examples/svg/opengl/framebufferobject/framebufferobject.pro
new file mode 100644
index 0000000..45f3f19
--- /dev/null
+++ b/examples/svg/opengl/framebufferobject/framebufferobject.pro
@@ -0,0 +1,9 @@
+QT += widgets opengl svg
+
+HEADERS += glwidget.h
+SOURCES += glwidget.cpp main.cpp
+RESOURCES += framebufferobject.qrc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/svg/opengl/framebufferobject
+INSTALLS += target
diff --git a/examples/opengl/framebufferobject/framebufferobject.qrc b/examples/svg/opengl/framebufferobject/framebufferobject.qrc
index 986f1ca..986f1ca 100644
--- a/examples/opengl/framebufferobject/framebufferobject.qrc
+++ b/examples/svg/opengl/framebufferobject/framebufferobject.qrc
diff --git a/examples/opengl/framebufferobject/glwidget.cpp b/examples/svg/opengl/framebufferobject/glwidget.cpp
index 1f3ff78..b3dadc8 100644
--- a/examples/opengl/framebufferobject/glwidget.cpp
+++ b/examples/svg/opengl/framebufferobject/glwidget.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/opengl/framebufferobject/glwidget.h b/examples/svg/opengl/framebufferobject/glwidget.h
index c689ad5..650cd52 100644
--- a/examples/opengl/framebufferobject/glwidget.h
+++ b/examples/svg/opengl/framebufferobject/glwidget.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/opengl/framebufferobject/main.cpp b/examples/svg/opengl/framebufferobject/main.cpp
index 3a414be..68ff064 100644
--- a/examples/opengl/framebufferobject/main.cpp
+++ b/examples/svg/opengl/framebufferobject/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/opengl/opengl.pro b/examples/svg/opengl/opengl.pro
new file mode 100644
index 0000000..9ebf5ed
--- /dev/null
+++ b/examples/svg/opengl/opengl.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+qtHaveModule(widgets): SUBDIRS += framebufferobject
diff --git a/examples/svg/richtext/richtext.pro b/examples/svg/richtext/richtext.pro
new file mode 100644
index 0000000..8d238e6
--- /dev/null
+++ b/examples/svg/richtext/richtext.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+qtHaveModule(widgets): SUBDIRS += textobject
diff --git a/examples/richtext/textobject/files/heart.svg b/examples/svg/richtext/textobject/files/heart.svg
index ba5f050..ba5f050 100644
--- a/examples/richtext/textobject/files/heart.svg
+++ b/examples/svg/richtext/textobject/files/heart.svg
diff --git a/examples/richtext/textobject/main.cpp b/examples/svg/richtext/textobject/main.cpp
index 4a0a6a0..910d8c4 100644
--- a/examples/richtext/textobject/main.cpp
+++ b/examples/svg/richtext/textobject/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/richtext/textobject/resources.qrc b/examples/svg/richtext/textobject/resources.qrc
index 39b2f5d..39b2f5d 100644
--- a/examples/richtext/textobject/resources.qrc
+++ b/examples/svg/richtext/textobject/resources.qrc
diff --git a/examples/richtext/textobject/svgtextobject.cpp b/examples/svg/richtext/textobject/svgtextobject.cpp
index 8e3e3e9..ab2a1c8 100644
--- a/examples/richtext/textobject/svgtextobject.cpp
+++ b/examples/svg/richtext/textobject/svgtextobject.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/richtext/textobject/svgtextobject.h b/examples/svg/richtext/textobject/svgtextobject.h
index f9ba114..ad98770 100644
--- a/examples/richtext/textobject/svgtextobject.h
+++ b/examples/svg/richtext/textobject/svgtextobject.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/richtext/textobject/textobject.desktop b/examples/svg/richtext/textobject/textobject.desktop
index 1b0980f..1b0980f 100644
--- a/examples/richtext/textobject/textobject.desktop
+++ b/examples/svg/richtext/textobject/textobject.desktop
diff --git a/examples/richtext/textobject/textobject.pro b/examples/svg/richtext/textobject/textobject.pro
index 5f0f913..794ad32 100644
--- a/examples/richtext/textobject/textobject.pro
+++ b/examples/svg/richtext/textobject/textobject.pro
@@ -4,17 +4,14 @@ SOURCES         = main.cpp \
                   svgtextobject.cpp \
                   window.cpp
 
-QT += svg
+QT += widgets svg
 
 RESOURCES       = resources.qrc
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/richtext/textobject
-sources.files = $$SOURCES $$HEADERS *.pro $$RESOURCES files
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/richtext/textobject
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/svg/richtext/textobject
+INSTALLS += target
 
 filesToDeploy.files = files/*.svg
 filesToDeploy.path = files
 DEPLOYMENT += filesToDeploy
-QT+=widgets
diff --git a/examples/richtext/textobject/window.cpp b/examples/svg/richtext/textobject/window.cpp
index ba1d16d..1331546 100644
--- a/examples/richtext/textobject/window.cpp
+++ b/examples/svg/richtext/textobject/window.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/richtext/textobject/window.h b/examples/svg/richtext/textobject/window.h
index 7551233..63942fc 100644
--- a/examples/richtext/textobject/window.h
+++ b/examples/svg/richtext/textobject/window.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/svg.pro b/examples/svg/svg.pro
index fdadc81..c828a95 100644
--- a/examples/svg/svg.pro
+++ b/examples/svg/svg.pro
@@ -1,10 +1,6 @@
 TEMPLATE = subdirs
 
-!contains(QT_CONFIG, no-widgets): SUBDIRS += embeddedsvgviewer  svggenerator  svgviewer
+qtHaveModule(widgets): SUBDIRS += embeddedsvgviewer  svggenerator  svgviewer
+SUBDIRS += embedded richtext draganddrop network
 
-QT+=widgets
-
-# install
-sources.files = svg.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg
-INSTALLS += sources
+qtHaveModule(opengl):!contains(QT_CONFIG, opengles2): SUBDIRS += opengl
diff --git a/examples/svg/svggenerator/displaywidget.cpp b/examples/svg/svggenerator/displaywidget.cpp
index 4bb6459..d6a8b51 100644
--- a/examples/svg/svggenerator/displaywidget.cpp
+++ b/examples/svg/svggenerator/displaywidget.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/svggenerator/displaywidget.h b/examples/svg/svggenerator/displaywidget.h
index eca7f5d..f5d8598 100644
--- a/examples/svg/svggenerator/displaywidget.h
+++ b/examples/svg/svggenerator/displaywidget.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/svggenerator/doc/src/svggenerator.qdoc b/examples/svg/svggenerator/doc/src/svggenerator.qdoc
index f9ec684..9fa13fb 100644
--- a/examples/svg/svggenerator/doc/src/svggenerator.qdoc
+++ b/examples/svg/svggenerator/doc/src/svggenerator.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the documentation of the Qt Toolkit.
diff --git a/examples/svg/svggenerator/main.cpp b/examples/svg/svggenerator/main.cpp
index a244f67..ddc94ae 100644
--- a/examples/svg/svggenerator/main.cpp
+++ b/examples/svg/svggenerator/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/svggenerator/svggenerator.pro b/examples/svg/svggenerator/svggenerator.pro
index 6945418..8ac904b 100644
--- a/examples/svg/svggenerator/svggenerator.pro
+++ b/examples/svg/svggenerator/svggenerator.pro
@@ -6,14 +6,10 @@ SOURCES   = displaywidget.cpp \
             main.cpp \
             window.cpp
 
-QT += svg
+QT += widgets svg
 
 INCLUDEPATH += $$PWD
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg/svggenerator
-sources.files = $$SOURCES $$HEADERS $$RESOURCES forms doc resources svggenerator.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg/svggenerator
-INSTALLS += target sources
-
-QT+=widgets
+target.path = $$[QT_INSTALL_EXAMPLES]/svg/svggenerator
+INSTALLS += target
diff --git a/examples/svg/svggenerator/window.cpp b/examples/svg/svggenerator/window.cpp
index 36c281e..faf7a94 100644
--- a/examples/svg/svggenerator/window.cpp
+++ b/examples/svg/svggenerator/window.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/svggenerator/window.h b/examples/svg/svggenerator/window.h
index 6dd55c1..4363ddc 100644
--- a/examples/svg/svggenerator/window.h
+++ b/examples/svg/svggenerator/window.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/svgviewer/doc/src/svgviewer.qdoc b/examples/svg/svgviewer/doc/src/svgviewer.qdoc
index 0b04792..5ced883 100644
--- a/examples/svg/svgviewer/doc/src/svgviewer.qdoc
+++ b/examples/svg/svgviewer/doc/src/svgviewer.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the documentation of the Qt Toolkit.
diff --git a/examples/svg/svgviewer/main.cpp b/examples/svg/svgviewer/main.cpp
index c8376c5..140490a 100644
--- a/examples/svg/svgviewer/main.cpp
+++ b/examples/svg/svgviewer/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/svgviewer/mainwindow.cpp b/examples/svg/svgviewer/mainwindow.cpp
index 71723ee..497d390 100644
--- a/examples/svg/svgviewer/mainwindow.cpp
+++ b/examples/svg/svgviewer/mainwindow.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/svgviewer/mainwindow.h b/examples/svg/svgviewer/mainwindow.h
index 09c4cea..8bfb885 100644
--- a/examples/svg/svgviewer/mainwindow.h
+++ b/examples/svg/svgviewer/mainwindow.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/svgviewer/svgview.cpp b/examples/svg/svgviewer/svgview.cpp
index 4c6f852..da9a4ae 100644
--- a/examples/svg/svgviewer/svgview.cpp
+++ b/examples/svg/svgviewer/svgview.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/svgviewer/svgview.h b/examples/svg/svgviewer/svgview.h
index e2635a0..944401a 100644
--- a/examples/svg/svgviewer/svgview.h
+++ b/examples/svg/svgviewer/svgview.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/svg/svgviewer/svgviewer.pro b/examples/svg/svgviewer/svgviewer.pro
index 9614741..eb2088c 100644
--- a/examples/svg/svgviewer/svgviewer.pro
+++ b/examples/svg/svgviewer/svgviewer.pro
@@ -4,22 +4,18 @@ RESOURCES     = svgviewer.qrc
 SOURCES       = main.cpp \
                 mainwindow.cpp \
                 svgview.cpp
-QT           += svg xml
+QT           += widgets svg xml
 
-contains(QT_CONFIG, opengl): QT += opengl
+qtHaveModule(opengl): QT += opengl
 
 CONFIG += console
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg/svgviewer
-sources.files = $$SOURCES $$HEADERS $$RESOURCES svgviewer.pro files
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg/svgviewer
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/svg/svgviewer
+INSTALLS += target
 
 wince*: {
      addFiles.files = files\\*.svg
      addFiles.path = "\\My Documents"
      DEPLOYMENT += addFiles
 }
-
-QT+=widgets