Move all other demos in qtbase to examples.

Change-Id: Iab0e7364d1f6b348d0e3033ea9304139f5bd6d0d
Reviewed-on: http://codereview.qt.nokia.com/617
Reviewed-by: Qt Sanity Bot <[email protected]>
Reviewed-by: David Boddie

378 files changed, 0 insertions, 137 deletions

diff --git a/demos/README b/demos/README
deleted file mode 100644
index b1619908e2a..00000000000
--- a/demos/README
+++ /dev/null
@@ -1,39 +0,0 @@
-These demonstrations are intended to highlight Qt's capabilities in different
-application areas, and provide examples that are more advanced than those in
-the examples directory.
-
-Beginners to Qt may wish to try out the Qt tutorial and some of the examples
-before examining the demonstrations in detail.
-
-
-The example launcher can be used to explore the different categories
-available. It provides an overview of each example, lets you view the
-documentation in Qt Assistant, and is able to launch examples.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/demos/demos.pro b/demos/demos.pro
deleted file mode 100644
index 81968fd61d0..00000000000
--- a/demos/demos.pro
+++ /dev/null
@@ -1,98 +0,0 @@
-TEMPLATE    = subdirs
-
-!contains(QT_CONFIG, no-gui) {
-SUBDIRS     = \
-            demos_shared \
-            demos_deform \
-            demos_gradients \
-            demos_pathstroke \
-            demos_affine \
-            demos_composition \
-            demos_books \
-            demos_interview \
-            demos_mainwindow \
-            demos_spreadsheet \
-            demos_textedit \
-            demos_chip \
-            demos_embeddeddialogs \
-            demos_undo \
-            demos_sub-attaq
-
-symbian: SUBDIRS = \
-            demos_shared \
-            demos_deform \
-            demos_pathstroke
-
-
-wince*:  SUBDIRS = \
-            demos_shared \
-            demos_deform \
-            demos_gradients \
-            demos_pathstroke \
-            demos_affine \
-            demos_composition \
-            demos_books \
-            demos_interview \
-            demos_mainwindow \
-            demos_spreadsheet \
-            demos_textedit \
-            # demos_chip \
-            demos_embeddeddialogs \
-            demos_undo \
-            demos_sub-attaq
-
-contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1):!contains(QT_CONFIG, opengles2):{
-SUBDIRS += demos_boxes
-}
-
-mac* && !qpa: SUBDIRS += demos_macmainwindow
-wince*|symbian|embedded|x11: SUBDIRS += demos_embedded
-
-!cross_compile:{
-contains(QT_BUILD_PARTS, tools):{
-SUBDIRS += demos_sqlbrowser
-}
-}
-
-# install
-sources.files = README *.pro
-sources.path = $$[QT_INSTALL_DEMOS]
-INSTALLS += sources
-
-symbian: CONFIG += qt_demo
-
-demos_chip.subdir = chip
-demos_embeddeddialogs.subdir = embeddeddialogs
-demos_embedded.subdir = embedded
-# Because of fluidlauncher
-demos_embedded.depends = demos_deform demos_pathstroke
-demos_shared.subdir = shared
-demos_deform.subdir = deform
-demos_gradients.subdir = gradients
-demos_pathstroke.subdir = pathstroke
-demos_affine.subdir = affine
-demos_composition.subdir = composition
-demos_books.subdir = books
-demos_interview.subdir = interview
-demos_macmainwindow.subdir = macmainwindow
-demos_mainwindow.subdir = mainwindow
-demos_spreadsheet.subdir = spreadsheet
-demos_textedit.subdir = textedit
-demos_arthurplugin.subdir = arthurplugin
-demos_sqlbrowser.subdir = sqlbrowser
-demos_undo.subdir = undo
-demos_qtdemo.subdir = qtdemo
-
-demos_boxes.subdir = boxes
-demos_sub-attaq.subdir = sub-attaq
-
-#CONFIG += ordered
-!ordered {
-     demos_affine.depends = demos_shared
-     demos_deform.depends = demos_shared
-     demos_gradients.depends = demos_shared
-     demos_composition.depends = demos_shared
-     demos_arthurplugin.depends = demos_shared
-     demos_pathstroke.depends = demos_shared
-}
-}
diff --git a/demos/sub-attaq/animationmanager.cpp b/examples/animation/sub-attaq/animationmanager.cpp
index c7e230e3d2a..c7e230e3d2a 100644
--- a/demos/sub-attaq/animationmanager.cpp
+++ b/examples/animation/sub-attaq/animationmanager.cpp
diff --git a/demos/sub-attaq/animationmanager.h b/examples/animation/sub-attaq/animationmanager.h
index 429d6564853..429d6564853 100644
--- a/demos/sub-attaq/animationmanager.h
+++ b/examples/animation/sub-attaq/animationmanager.h
diff --git a/demos/sub-attaq/boat.cpp b/examples/animation/sub-attaq/boat.cpp
index 4ddf59e6a00..4ddf59e6a00 100644
--- a/demos/sub-attaq/boat.cpp
+++ b/examples/animation/sub-attaq/boat.cpp
diff --git a/demos/sub-attaq/boat.h b/examples/animation/sub-attaq/boat.h
index 71e3512fc34..71e3512fc34 100644
--- a/demos/sub-attaq/boat.h
+++ b/examples/animation/sub-attaq/boat.h
diff --git a/demos/sub-attaq/boat_p.h b/examples/animation/sub-attaq/boat_p.h
index 9022a4ca513..9022a4ca513 100644
--- a/demos/sub-attaq/boat_p.h
+++ b/examples/animation/sub-attaq/boat_p.h
diff --git a/demos/sub-attaq/bomb.cpp b/examples/animation/sub-attaq/bomb.cpp
index 6811a27e883..6811a27e883 100644
--- a/demos/sub-attaq/bomb.cpp
+++ b/examples/animation/sub-attaq/bomb.cpp
diff --git a/demos/sub-attaq/bomb.h b/examples/animation/sub-attaq/bomb.h
index 222c3d029fc..222c3d029fc 100644
--- a/demos/sub-attaq/bomb.h
+++ b/examples/animation/sub-attaq/bomb.h
diff --git a/demos/sub-attaq/data.xml b/examples/animation/sub-attaq/data.xml
index 0f30515ddfc..0f30515ddfc 100644
--- a/demos/sub-attaq/data.xml
+++ b/examples/animation/sub-attaq/data.xml
diff --git a/demos/sub-attaq/graphicsscene.cpp b/examples/animation/sub-attaq/graphicsscene.cpp
index f82d441068a..f82d441068a 100644
--- a/demos/sub-attaq/graphicsscene.cpp
+++ b/examples/animation/sub-attaq/graphicsscene.cpp
diff --git a/demos/sub-attaq/graphicsscene.h b/examples/animation/sub-attaq/graphicsscene.h
index e1220a5eb86..e1220a5eb86 100644
--- a/demos/sub-attaq/graphicsscene.h
+++ b/examples/animation/sub-attaq/graphicsscene.h
diff --git a/demos/sub-attaq/main.cpp b/examples/animation/sub-attaq/main.cpp
index c8e534e7e76..c8e534e7e76 100644
--- a/demos/sub-attaq/main.cpp
+++ b/examples/animation/sub-attaq/main.cpp
diff --git a/demos/sub-attaq/mainwindow.cpp b/examples/animation/sub-attaq/mainwindow.cpp
index 81632a50a09..81632a50a09 100644
--- a/demos/sub-attaq/mainwindow.cpp
+++ b/examples/animation/sub-attaq/mainwindow.cpp
diff --git a/demos/sub-attaq/mainwindow.h b/examples/animation/sub-attaq/mainwindow.h
index 933587a262e..933587a262e 100644
--- a/demos/sub-attaq/mainwindow.h
+++ b/examples/animation/sub-attaq/mainwindow.h
diff --git a/demos/sub-attaq/pics/big/background.png b/examples/animation/sub-attaq/pics/big/background.png
index 9f581571fad..9f581571fad 100644
--- a/demos/sub-attaq/pics/big/background.png
+++ b/examples/animation/sub-attaq/pics/big/background.png
diff --git a/demos/sub-attaq/pics/big/boat.png b/examples/animation/sub-attaq/pics/big/boat.png
index be82dff62ae..be82dff62ae 100644
--- a/demos/sub-attaq/pics/big/boat.png
+++ b/examples/animation/sub-attaq/pics/big/boat.png
diff --git a/demos/sub-attaq/pics/big/bomb.png b/examples/animation/sub-attaq/pics/big/bomb.png
index 3af5f2f29cc..3af5f2f29cc 100644
--- a/demos/sub-attaq/pics/big/bomb.png
+++ b/examples/animation/sub-attaq/pics/big/bomb.png
diff --git a/demos/sub-attaq/pics/big/explosion/boat/step1.png b/examples/animation/sub-attaq/pics/big/explosion/boat/step1.png
index c9fd8b09843..c9fd8b09843 100644
--- a/demos/sub-attaq/pics/big/explosion/boat/step1.png
+++ b/examples/animation/sub-attaq/pics/big/explosion/boat/step1.png
diff --git a/demos/sub-attaq/pics/big/explosion/boat/step2.png b/examples/animation/sub-attaq/pics/big/explosion/boat/step2.png
index 7528f2d2daf..7528f2d2daf 100644
--- a/demos/sub-attaq/pics/big/explosion/boat/step2.png
+++ b/examples/animation/sub-attaq/pics/big/explosion/boat/step2.png
diff --git a/demos/sub-attaq/pics/big/explosion/boat/step3.png b/examples/animation/sub-attaq/pics/big/explosion/boat/step3.png
index aae9c9c184a..aae9c9c184a 100644
--- a/demos/sub-attaq/pics/big/explosion/boat/step3.png
+++ b/examples/animation/sub-attaq/pics/big/explosion/boat/step3.png
diff --git a/demos/sub-attaq/pics/big/explosion/boat/step4.png b/examples/animation/sub-attaq/pics/big/explosion/boat/step4.png
index d697c1bae80..d697c1bae80 100644
--- a/demos/sub-attaq/pics/big/explosion/boat/step4.png
+++ b/examples/animation/sub-attaq/pics/big/explosion/boat/step4.png
diff --git a/demos/sub-attaq/pics/big/explosion/submarine/step1.png b/examples/animation/sub-attaq/pics/big/explosion/submarine/step1.png
index 88ca5144b7e..88ca5144b7e 100644
--- a/demos/sub-attaq/pics/big/explosion/submarine/step1.png
+++ b/examples/animation/sub-attaq/pics/big/explosion/submarine/step1.png
diff --git a/demos/sub-attaq/pics/big/explosion/submarine/step2.png b/examples/animation/sub-attaq/pics/big/explosion/submarine/step2.png
index 524f5890ee4..524f5890ee4 100644
--- a/demos/sub-attaq/pics/big/explosion/submarine/step2.png
+++ b/examples/animation/sub-attaq/pics/big/explosion/submarine/step2.png
diff --git a/demos/sub-attaq/pics/big/explosion/submarine/step3.png b/examples/animation/sub-attaq/pics/big/explosion/submarine/step3.png
index 2cca1e80feb..2cca1e80feb 100644
--- a/demos/sub-attaq/pics/big/explosion/submarine/step3.png
+++ b/examples/animation/sub-attaq/pics/big/explosion/submarine/step3.png
diff --git a/demos/sub-attaq/pics/big/explosion/submarine/step4.png b/examples/animation/sub-attaq/pics/big/explosion/submarine/step4.png
index 82100a8260a..82100a8260a 100644
--- a/demos/sub-attaq/pics/big/explosion/submarine/step4.png
+++ b/examples/animation/sub-attaq/pics/big/explosion/submarine/step4.png
diff --git a/demos/sub-attaq/pics/big/submarine.png b/examples/animation/sub-attaq/pics/big/submarine.png
index df435dc47d6..df435dc47d6 100644
--- a/demos/sub-attaq/pics/big/submarine.png
+++ b/examples/animation/sub-attaq/pics/big/submarine.png
diff --git a/demos/sub-attaq/pics/big/surface.png b/examples/animation/sub-attaq/pics/big/surface.png
index 4eba29e9cd1..4eba29e9cd1 100644
--- a/demos/sub-attaq/pics/big/surface.png
+++ b/examples/animation/sub-attaq/pics/big/surface.png
diff --git a/demos/sub-attaq/pics/big/torpedo.png b/examples/animation/sub-attaq/pics/big/torpedo.png
index f9c26873f18..f9c26873f18 100644
--- a/demos/sub-attaq/pics/big/torpedo.png
+++ b/examples/animation/sub-attaq/pics/big/torpedo.png
diff --git a/demos/sub-attaq/pics/scalable/background-n810.svg b/examples/animation/sub-attaq/pics/scalable/background-n810.svg
index ece9f7aaf14..ece9f7aaf14 100644
--- a/demos/sub-attaq/pics/scalable/background-n810.svg
+++ b/examples/animation/sub-attaq/pics/scalable/background-n810.svg
diff --git a/demos/sub-attaq/pics/scalable/background.svg b/examples/animation/sub-attaq/pics/scalable/background.svg
index 0be268010e4..0be268010e4 100644
--- a/demos/sub-attaq/pics/scalable/background.svg
+++ b/examples/animation/sub-attaq/pics/scalable/background.svg
diff --git a/demos/sub-attaq/pics/scalable/boat.svg b/examples/animation/sub-attaq/pics/scalable/boat.svg
index 5298821ba8d..5298821ba8d 100644
--- a/demos/sub-attaq/pics/scalable/boat.svg
+++ b/examples/animation/sub-attaq/pics/scalable/boat.svg
diff --git a/demos/sub-attaq/pics/scalable/bomb.svg b/examples/animation/sub-attaq/pics/scalable/bomb.svg
index 294771a6ddd..294771a6ddd 100644
--- a/demos/sub-attaq/pics/scalable/bomb.svg
+++ b/examples/animation/sub-attaq/pics/scalable/bomb.svg
diff --git a/demos/sub-attaq/pics/scalable/sand.svg b/examples/animation/sub-attaq/pics/scalable/sand.svg
index 8af11b7a666..8af11b7a666 100644
--- a/demos/sub-attaq/pics/scalable/sand.svg
+++ b/examples/animation/sub-attaq/pics/scalable/sand.svg
diff --git a/demos/sub-attaq/pics/scalable/see.svg b/examples/animation/sub-attaq/pics/scalable/see.svg
index 0666691215c..0666691215c 100644
--- a/demos/sub-attaq/pics/scalable/see.svg
+++ b/examples/animation/sub-attaq/pics/scalable/see.svg
diff --git a/demos/sub-attaq/pics/scalable/sky.svg b/examples/animation/sub-attaq/pics/scalable/sky.svg
index 1546c087a7e..1546c087a7e 100644
--- a/demos/sub-attaq/pics/scalable/sky.svg
+++ b/examples/animation/sub-attaq/pics/scalable/sky.svg
diff --git a/demos/sub-attaq/pics/scalable/sub-attaq.svg b/examples/animation/sub-attaq/pics/scalable/sub-attaq.svg
index b075179b461..b075179b461 100644
--- a/demos/sub-attaq/pics/scalable/sub-attaq.svg
+++ b/examples/animation/sub-attaq/pics/scalable/sub-attaq.svg
diff --git a/demos/sub-attaq/pics/scalable/submarine.svg b/examples/animation/sub-attaq/pics/scalable/submarine.svg
index 8a0ffddbcad..8a0ffddbcad 100644
--- a/demos/sub-attaq/pics/scalable/submarine.svg
+++ b/examples/animation/sub-attaq/pics/scalable/submarine.svg
diff --git a/demos/sub-attaq/pics/scalable/surface.svg b/examples/animation/sub-attaq/pics/scalable/surface.svg
index 40ed239638e..40ed239638e 100644
--- a/demos/sub-attaq/pics/scalable/surface.svg
+++ b/examples/animation/sub-attaq/pics/scalable/surface.svg
diff --git a/demos/sub-attaq/pics/scalable/torpedo.svg b/examples/animation/sub-attaq/pics/scalable/torpedo.svg
index 48e429d2bfb..48e429d2bfb 100644
--- a/demos/sub-attaq/pics/scalable/torpedo.svg
+++ b/examples/animation/sub-attaq/pics/scalable/torpedo.svg
diff --git a/demos/sub-attaq/pics/small/background.png b/examples/animation/sub-attaq/pics/small/background.png
index 5ad3db660a9..5ad3db660a9 100644
--- a/demos/sub-attaq/pics/small/background.png
+++ b/examples/animation/sub-attaq/pics/small/background.png
diff --git a/demos/sub-attaq/pics/small/boat.png b/examples/animation/sub-attaq/pics/small/boat.png
index 114ccc310e5..114ccc310e5 100644
--- a/demos/sub-attaq/pics/small/boat.png
+++ b/examples/animation/sub-attaq/pics/small/boat.png
diff --git a/demos/sub-attaq/pics/small/bomb.png b/examples/animation/sub-attaq/pics/small/bomb.png
index 3af5f2f29cc..3af5f2f29cc 100644
--- a/demos/sub-attaq/pics/small/bomb.png
+++ b/examples/animation/sub-attaq/pics/small/bomb.png
diff --git a/demos/sub-attaq/pics/small/submarine.png b/examples/animation/sub-attaq/pics/small/submarine.png
index 0c0c350600c..0c0c350600c 100644
--- a/demos/sub-attaq/pics/small/submarine.png
+++ b/examples/animation/sub-attaq/pics/small/submarine.png
diff --git a/demos/sub-attaq/pics/small/surface.png b/examples/animation/sub-attaq/pics/small/surface.png
index 06d0e47a5c1..06d0e47a5c1 100644
--- a/demos/sub-attaq/pics/small/surface.png
+++ b/examples/animation/sub-attaq/pics/small/surface.png
diff --git a/demos/sub-attaq/pics/small/torpedo.png b/examples/animation/sub-attaq/pics/small/torpedo.png
index f9c26873f18..f9c26873f18 100644
--- a/demos/sub-attaq/pics/small/torpedo.png
+++ b/examples/animation/sub-attaq/pics/small/torpedo.png
diff --git a/demos/sub-attaq/pics/welcome/logo-a.png b/examples/animation/sub-attaq/pics/welcome/logo-a.png
index 67dd76dac0a..67dd76dac0a 100644
--- a/demos/sub-attaq/pics/welcome/logo-a.png
+++ b/examples/animation/sub-attaq/pics/welcome/logo-a.png
diff --git a/demos/sub-attaq/pics/welcome/logo-a2.png b/examples/animation/sub-attaq/pics/welcome/logo-a2.png
index 17668b07de0..17668b07de0 100644
--- a/demos/sub-attaq/pics/welcome/logo-a2.png
+++ b/examples/animation/sub-attaq/pics/welcome/logo-a2.png
diff --git a/demos/sub-attaq/pics/welcome/logo-b.png b/examples/animation/sub-attaq/pics/welcome/logo-b.png
index cf6c04560b9..cf6c04560b9 100644
--- a/demos/sub-attaq/pics/welcome/logo-b.png
+++ b/examples/animation/sub-attaq/pics/welcome/logo-b.png
diff --git a/demos/sub-attaq/pics/welcome/logo-dash.png b/examples/animation/sub-attaq/pics/welcome/logo-dash.png
index 219233ce6ba..219233ce6ba 100644
--- a/demos/sub-attaq/pics/welcome/logo-dash.png
+++ b/examples/animation/sub-attaq/pics/welcome/logo-dash.png
diff --git a/demos/sub-attaq/pics/welcome/logo-excl.png b/examples/animation/sub-attaq/pics/welcome/logo-excl.png
index 8dd0a2eb867..8dd0a2eb867 100644
--- a/demos/sub-attaq/pics/welcome/logo-excl.png
+++ b/examples/animation/sub-attaq/pics/welcome/logo-excl.png
diff --git a/demos/sub-attaq/pics/welcome/logo-q.png b/examples/animation/sub-attaq/pics/welcome/logo-q.png
index 86e588d4d83..86e588d4d83 100644
--- a/demos/sub-attaq/pics/welcome/logo-q.png
+++ b/examples/animation/sub-attaq/pics/welcome/logo-q.png
diff --git a/demos/sub-attaq/pics/welcome/logo-s.png b/examples/animation/sub-attaq/pics/welcome/logo-s.png
index 7b6a36e93a5..7b6a36e93a5 100644
--- a/demos/sub-attaq/pics/welcome/logo-s.png
+++ b/examples/animation/sub-attaq/pics/welcome/logo-s.png
diff --git a/demos/sub-attaq/pics/welcome/logo-t.png b/examples/animation/sub-attaq/pics/welcome/logo-t.png
index b2e3526beae..b2e3526beae 100644
--- a/demos/sub-attaq/pics/welcome/logo-t.png
+++ b/examples/animation/sub-attaq/pics/welcome/logo-t.png
diff --git a/demos/sub-attaq/pics/welcome/logo-t2.png b/examples/animation/sub-attaq/pics/welcome/logo-t2.png
index b11a77886ec..b11a77886ec 100644
--- a/demos/sub-attaq/pics/welcome/logo-t2.png
+++ b/examples/animation/sub-attaq/pics/welcome/logo-t2.png
diff --git a/demos/sub-attaq/pics/welcome/logo-u.png b/examples/animation/sub-attaq/pics/welcome/logo-u.png
index 24eede887a2..24eede887a2 100644
--- a/demos/sub-attaq/pics/welcome/logo-u.png
+++ b/examples/animation/sub-attaq/pics/welcome/logo-u.png
diff --git a/demos/sub-attaq/pixmapitem.cpp b/examples/animation/sub-attaq/pixmapitem.cpp
index be75bd1995c..be75bd1995c 100644
--- a/demos/sub-attaq/pixmapitem.cpp
+++ b/examples/animation/sub-attaq/pixmapitem.cpp
diff --git a/demos/sub-attaq/pixmapitem.h b/examples/animation/sub-attaq/pixmapitem.h
index 0a94aab7ebe..0a94aab7ebe 100644
--- a/demos/sub-attaq/pixmapitem.h
+++ b/examples/animation/sub-attaq/pixmapitem.h
diff --git a/demos/sub-attaq/progressitem.cpp b/examples/animation/sub-attaq/progressitem.cpp
index 426dedfbd4b..426dedfbd4b 100644
--- a/demos/sub-attaq/progressitem.cpp
+++ b/examples/animation/sub-attaq/progressitem.cpp
diff --git a/demos/sub-attaq/progressitem.h b/examples/animation/sub-attaq/progressitem.h
index bcf708c512f..bcf708c512f 100644
--- a/demos/sub-attaq/progressitem.h
+++ b/examples/animation/sub-attaq/progressitem.h
diff --git a/demos/sub-attaq/qanimationstate.cpp b/examples/animation/sub-attaq/qanimationstate.cpp
index 593c8dfe8d0..593c8dfe8d0 100644
--- a/demos/sub-attaq/qanimationstate.cpp
+++ b/examples/animation/sub-attaq/qanimationstate.cpp
diff --git a/demos/sub-attaq/qanimationstate.h b/examples/animation/sub-attaq/qanimationstate.h
index aace3b502bb..aace3b502bb 100644
--- a/demos/sub-attaq/qanimationstate.h
+++ b/examples/animation/sub-attaq/qanimationstate.h
diff --git a/demos/sub-attaq/states.cpp b/examples/animation/sub-attaq/states.cpp
index 462e13b90e1..462e13b90e1 100644
--- a/demos/sub-attaq/states.cpp
+++ b/examples/animation/sub-attaq/states.cpp
diff --git a/demos/sub-attaq/states.h b/examples/animation/sub-attaq/states.h
index cda96031962..cda96031962 100644
--- a/demos/sub-attaq/states.h
+++ b/examples/animation/sub-attaq/states.h
diff --git a/demos/sub-attaq/sub-attaq.pro b/examples/animation/sub-attaq/sub-attaq.pro
index 5575f5e65f0..5575f5e65f0 100644
--- a/demos/sub-attaq/sub-attaq.pro
+++ b/examples/animation/sub-attaq/sub-attaq.pro
diff --git a/demos/sub-attaq/subattaq.qrc b/examples/animation/sub-attaq/subattaq.qrc
index 80a3af11ccc..80a3af11ccc 100644
--- a/demos/sub-attaq/subattaq.qrc
+++ b/examples/animation/sub-attaq/subattaq.qrc
diff --git a/demos/sub-attaq/submarine.cpp b/examples/animation/sub-attaq/submarine.cpp
index 2c8a5a2884f..2c8a5a2884f 100644
--- a/demos/sub-attaq/submarine.cpp
+++ b/examples/animation/sub-attaq/submarine.cpp
diff --git a/demos/sub-attaq/submarine.h b/examples/animation/sub-attaq/submarine.h
index 0d6087dc269..0d6087dc269 100644
--- a/demos/sub-attaq/submarine.h
+++ b/examples/animation/sub-attaq/submarine.h
diff --git a/demos/sub-attaq/submarine_p.h b/examples/animation/sub-attaq/submarine_p.h
index f0b370d8788..f0b370d8788 100644
--- a/demos/sub-attaq/submarine_p.h
+++ b/examples/animation/sub-attaq/submarine_p.h
diff --git a/demos/sub-attaq/textinformationitem.cpp b/examples/animation/sub-attaq/textinformationitem.cpp
index e2653361a11..e2653361a11 100644
--- a/demos/sub-attaq/textinformationitem.cpp
+++ b/examples/animation/sub-attaq/textinformationitem.cpp
diff --git a/demos/sub-attaq/textinformationitem.h b/examples/animation/sub-attaq/textinformationitem.h
index 4b5f71969f9..4b5f71969f9 100644
--- a/demos/sub-attaq/textinformationitem.h
+++ b/examples/animation/sub-attaq/textinformationitem.h
diff --git a/demos/sub-attaq/torpedo.cpp b/examples/animation/sub-attaq/torpedo.cpp
index 8c9bacfa384..8c9bacfa384 100644
--- a/demos/sub-attaq/torpedo.cpp
+++ b/examples/animation/sub-attaq/torpedo.cpp
diff --git a/demos/sub-attaq/torpedo.h b/examples/animation/sub-attaq/torpedo.h
index a5ec24dabf6..a5ec24dabf6 100644
--- a/demos/sub-attaq/torpedo.h
+++ b/examples/animation/sub-attaq/torpedo.h
diff --git a/demos/embedded/digiflip/digiflip.cpp b/examples/embedded/digiflip/digiflip.cpp
index 895524355e9..895524355e9 100644
--- a/demos/embedded/digiflip/digiflip.cpp
+++ b/examples/embedded/digiflip/digiflip.cpp
diff --git a/demos/embedded/digiflip/digiflip.pro b/examples/embedded/digiflip/digiflip.pro
index 7fa06fa90a0..7fa06fa90a0 100644
--- a/demos/embedded/digiflip/digiflip.pro
+++ b/examples/embedded/digiflip/digiflip.pro
diff --git a/demos/embedded/embedded.pro b/examples/embedded/embedded.pro
index e9a448b1e30..e9a448b1e30 100644
--- a/demos/embedded/embedded.pro
+++ b/examples/embedded/embedded.pro
diff --git a/demos/embedded/flickable/flickable.cpp b/examples/embedded/flickable/flickable.cpp
index edcc1a73964..edcc1a73964 100644
--- a/demos/embedded/flickable/flickable.cpp
+++ b/examples/embedded/flickable/flickable.cpp
diff --git a/demos/embedded/flickable/flickable.h b/examples/embedded/flickable/flickable.h
index 3195d3297c6..3195d3297c6 100644
--- a/demos/embedded/flickable/flickable.h
+++ b/examples/embedded/flickable/flickable.h
diff --git a/demos/embedded/flickable/flickable.pro b/examples/embedded/flickable/flickable.pro
index 6ee744bc637..6ee744bc637 100644
--- a/demos/embedded/flickable/flickable.pro
+++ b/examples/embedded/flickable/flickable.pro
diff --git a/demos/embedded/flickable/main.cpp b/examples/embedded/flickable/main.cpp
index 3711a6dc57b..3711a6dc57b 100644
--- a/demos/embedded/flickable/main.cpp
+++ b/examples/embedded/flickable/main.cpp
diff --git a/demos/embedded/flightinfo/aircraft.png b/examples/embedded/flightinfo/aircraft.png
index 2312bcc9f0a..2312bcc9f0a 100644
--- a/demos/embedded/flightinfo/aircraft.png
+++ b/examples/embedded/flightinfo/aircraft.png
diff --git a/demos/embedded/flightinfo/flightinfo.cpp b/examples/embedded/flightinfo/flightinfo.cpp
index 58e71c83761..58e71c83761 100644
--- a/demos/embedded/flightinfo/flightinfo.cpp
+++ b/examples/embedded/flightinfo/flightinfo.cpp
diff --git a/demos/embedded/flightinfo/flightinfo.pro b/examples/embedded/flightinfo/flightinfo.pro
index a33423f543e..a33423f543e 100644
--- a/demos/embedded/flightinfo/flightinfo.pro
+++ b/examples/embedded/flightinfo/flightinfo.pro
diff --git a/demos/embedded/flightinfo/flightinfo.qrc b/examples/embedded/flightinfo/flightinfo.qrc
index babea7e0cb7..babea7e0cb7 100644
--- a/demos/embedded/flightinfo/flightinfo.qrc
+++ b/examples/embedded/flightinfo/flightinfo.qrc
diff --git a/demos/embedded/flightinfo/form.ui b/examples/embedded/flightinfo/form.ui
index 3a24c758a61..3a24c758a61 100644
--- a/demos/embedded/flightinfo/form.ui
+++ b/examples/embedded/flightinfo/form.ui
diff --git a/demos/embedded/lightmaps/lightmaps.cpp b/examples/embedded/lightmaps/lightmaps.cpp
index d672530e197..d672530e197 100644
--- a/demos/embedded/lightmaps/lightmaps.cpp
+++ b/examples/embedded/lightmaps/lightmaps.cpp
diff --git a/demos/embedded/lightmaps/lightmaps.h b/examples/embedded/lightmaps/lightmaps.h
index 45b5c188a22..45b5c188a22 100644
--- a/demos/embedded/lightmaps/lightmaps.h
+++ b/examples/embedded/lightmaps/lightmaps.h
diff --git a/demos/embedded/lightmaps/lightmaps.pro b/examples/embedded/lightmaps/lightmaps.pro
index 2751c3a647e..2751c3a647e 100644
--- a/demos/embedded/lightmaps/lightmaps.pro
+++ b/examples/embedded/lightmaps/lightmaps.pro
diff --git a/demos/embedded/lightmaps/main.cpp b/examples/embedded/lightmaps/main.cpp
index 85f74e638e3..85f74e638e3 100644
--- a/demos/embedded/lightmaps/main.cpp
+++ b/examples/embedded/lightmaps/main.cpp
diff --git a/demos/embedded/lightmaps/mapzoom.cpp b/examples/embedded/lightmaps/mapzoom.cpp
index d01457e3f48..d01457e3f48 100644
--- a/demos/embedded/lightmaps/mapzoom.cpp
+++ b/examples/embedded/lightmaps/mapzoom.cpp
diff --git a/demos/embedded/lightmaps/mapzoom.h b/examples/embedded/lightmaps/mapzoom.h
index ac70a233167..ac70a233167 100644
--- a/demos/embedded/lightmaps/mapzoom.h
+++ b/examples/embedded/lightmaps/mapzoom.h
diff --git a/demos/embedded/lightmaps/slippymap.cpp b/examples/embedded/lightmaps/slippymap.cpp
index 8c71f2946a8..8c71f2946a8 100644
--- a/demos/embedded/lightmaps/slippymap.cpp
+++ b/examples/embedded/lightmaps/slippymap.cpp
diff --git a/demos/embedded/lightmaps/slippymap.h b/examples/embedded/lightmaps/slippymap.h
index 64ba5c3e59e..64ba5c3e59e 100644
--- a/demos/embedded/lightmaps/slippymap.h
+++ b/examples/embedded/lightmaps/slippymap.h
diff --git a/demos/embedded/raycasting/raycasting.cpp b/examples/embedded/raycasting/raycasting.cpp
index d404044a9a2..d404044a9a2 100644
--- a/demos/embedded/raycasting/raycasting.cpp
+++ b/examples/embedded/raycasting/raycasting.cpp
diff --git a/demos/embedded/raycasting/raycasting.pro b/examples/embedded/raycasting/raycasting.pro
index a4bb1826b92..a4bb1826b92 100644
--- a/demos/embedded/raycasting/raycasting.pro
+++ b/examples/embedded/raycasting/raycasting.pro
diff --git a/demos/embedded/raycasting/raycasting.qrc b/examples/embedded/raycasting/raycasting.qrc
index 974a06093c9..974a06093c9 100644
--- a/demos/embedded/raycasting/raycasting.qrc
+++ b/examples/embedded/raycasting/raycasting.qrc
diff --git a/demos/embedded/raycasting/textures.png b/examples/embedded/raycasting/textures.png
index 2eb1ba7ff6a..2eb1ba7ff6a 100644
--- a/demos/embedded/raycasting/textures.png
+++ b/examples/embedded/raycasting/textures.png
diff --git a/demos/embedded/styledemo/files/add.png b/examples/embedded/styledemo/files/add.png
index fc5c16d4c80..fc5c16d4c80 100755
--- a/demos/embedded/styledemo/files/add.png
+++ b/examples/embedded/styledemo/files/add.png
diff --git a/demos/embedded/styledemo/files/application.qss b/examples/embedded/styledemo/files/application.qss
index 432fe6bc76b..432fe6bc76b 100644
--- a/demos/embedded/styledemo/files/application.qss
+++ b/examples/embedded/styledemo/files/application.qss
diff --git a/demos/embedded/styledemo/files/blue.qss b/examples/embedded/styledemo/files/blue.qss
index ac8671b5e4a..ac8671b5e4a 100644
--- a/demos/embedded/styledemo/files/blue.qss
+++ b/examples/embedded/styledemo/files/blue.qss
diff --git a/demos/embedded/styledemo/files/khaki.qss b/examples/embedded/styledemo/files/khaki.qss
index b0d4a0fa6fe..b0d4a0fa6fe 100644
--- a/demos/embedded/styledemo/files/khaki.qss
+++ b/examples/embedded/styledemo/files/khaki.qss
diff --git a/demos/embedded/styledemo/files/nature_1.jpg b/examples/embedded/styledemo/files/nature_1.jpg
index 3a04edb96a0..3a04edb96a0 100644
--- a/demos/embedded/styledemo/files/nature_1.jpg
+++ b/examples/embedded/styledemo/files/nature_1.jpg
diff --git a/demos/embedded/styledemo/files/nostyle.qss b/examples/embedded/styledemo/files/nostyle.qss
index e69de29bb2d..e69de29bb2d 100644
--- a/demos/embedded/styledemo/files/nostyle.qss
+++ b/examples/embedded/styledemo/files/nostyle.qss
diff --git a/demos/embedded/styledemo/files/remove.png b/examples/embedded/styledemo/files/remove.png
index a0ab1fa21a6..a0ab1fa21a6 100755
--- a/demos/embedded/styledemo/files/remove.png
+++ b/examples/embedded/styledemo/files/remove.png
diff --git a/demos/embedded/styledemo/files/transparent.qss b/examples/embedded/styledemo/files/transparent.qss
index b38eb366f4e..b38eb366f4e 100644
--- a/demos/embedded/styledemo/files/transparent.qss
+++ b/examples/embedded/styledemo/files/transparent.qss
diff --git a/demos/embedded/styledemo/main.cpp b/examples/embedded/styledemo/main.cpp
index 7a484b03656..7a484b03656 100644
--- a/demos/embedded/styledemo/main.cpp
+++ b/examples/embedded/styledemo/main.cpp
diff --git a/demos/embedded/styledemo/styledemo.pro b/examples/embedded/styledemo/styledemo.pro
index 60700dd1dff..60700dd1dff 100644
--- a/demos/embedded/styledemo/styledemo.pro
+++ b/examples/embedded/styledemo/styledemo.pro
diff --git a/demos/embedded/styledemo/styledemo.qrc b/examples/embedded/styledemo/styledemo.qrc
index 96237d4203c..96237d4203c 100644
--- a/demos/embedded/styledemo/styledemo.qrc
+++ b/examples/embedded/styledemo/styledemo.qrc
diff --git a/demos/embedded/styledemo/stylewidget.cpp b/examples/embedded/styledemo/stylewidget.cpp
index 7bac8a84d78..7bac8a84d78 100644
--- a/demos/embedded/styledemo/stylewidget.cpp
+++ b/examples/embedded/styledemo/stylewidget.cpp
diff --git a/demos/embedded/styledemo/stylewidget.h b/examples/embedded/styledemo/stylewidget.h
index 11fa5348de7..11fa5348de7 100644
--- a/demos/embedded/styledemo/stylewidget.h
+++ b/examples/embedded/styledemo/stylewidget.h
diff --git a/demos/embedded/styledemo/stylewidget.ui b/examples/embedded/styledemo/stylewidget.ui
index 767f44aead7..767f44aead7 100644
--- a/demos/embedded/styledemo/stylewidget.ui
+++ b/examples/embedded/styledemo/stylewidget.ui
diff --git a/demos/boxes/3rdparty/fbm.c b/examples/graphicsview/boxes/3rdparty/fbm.c
index 98eb87a33bb..98eb87a33bb 100644
--- a/demos/boxes/3rdparty/fbm.c
+++ b/examples/graphicsview/boxes/3rdparty/fbm.c
diff --git a/demos/boxes/3rdparty/fbm.h b/examples/graphicsview/boxes/3rdparty/fbm.h
index b8a4a99ae4b..b8a4a99ae4b 100644
--- a/demos/boxes/3rdparty/fbm.h
+++ b/examples/graphicsview/boxes/3rdparty/fbm.h
diff --git a/demos/boxes/basic.fsh b/examples/graphicsview/boxes/basic.fsh
index faf36016068..faf36016068 100644
--- a/demos/boxes/basic.fsh
+++ b/examples/graphicsview/boxes/basic.fsh
diff --git a/demos/boxes/basic.vsh b/examples/graphicsview/boxes/basic.vsh
index 31acc4224ad..31acc4224ad 100644
--- a/demos/boxes/basic.vsh
+++ b/examples/graphicsview/boxes/basic.vsh
diff --git a/demos/boxes/boxes.pro b/examples/graphicsview/boxes/boxes.pro
index d599a3a0acb..d599a3a0acb 100644
--- a/demos/boxes/boxes.pro
+++ b/examples/graphicsview/boxes/boxes.pro
diff --git a/demos/boxes/boxes.qrc b/examples/graphicsview/boxes/boxes.qrc
index d27506dc5ad..d27506dc5ad 100644
--- a/demos/boxes/boxes.qrc
+++ b/examples/graphicsview/boxes/boxes.qrc
diff --git a/demos/boxes/cubemap_negx.jpg b/examples/graphicsview/boxes/cubemap_negx.jpg
index 07c282eab9e..07c282eab9e 100644
--- a/demos/boxes/cubemap_negx.jpg
+++ b/examples/graphicsview/boxes/cubemap_negx.jpg
diff --git a/demos/boxes/cubemap_negy.jpg b/examples/graphicsview/boxes/cubemap_negy.jpg
index 46cd2f9cf38..46cd2f9cf38 100644
--- a/demos/boxes/cubemap_negy.jpg
+++ b/examples/graphicsview/boxes/cubemap_negy.jpg
diff --git a/demos/boxes/cubemap_negz.jpg b/examples/graphicsview/boxes/cubemap_negz.jpg
index 40c01ddff34..40c01ddff34 100644
--- a/demos/boxes/cubemap_negz.jpg
+++ b/examples/graphicsview/boxes/cubemap_negz.jpg
diff --git a/demos/boxes/cubemap_posx.jpg b/examples/graphicsview/boxes/cubemap_posx.jpg
index 0b42e8a1b17..0b42e8a1b17 100644
--- a/demos/boxes/cubemap_posx.jpg
+++ b/examples/graphicsview/boxes/cubemap_posx.jpg
diff --git a/demos/boxes/cubemap_posy.jpg b/examples/graphicsview/boxes/cubemap_posy.jpg
index 2aca9b1e986..2aca9b1e986 100644
--- a/demos/boxes/cubemap_posy.jpg
+++ b/examples/graphicsview/boxes/cubemap_posy.jpg
diff --git a/demos/boxes/cubemap_posz.jpg b/examples/graphicsview/boxes/cubemap_posz.jpg
index 2e49173848c..2e49173848c 100644
--- a/demos/boxes/cubemap_posz.jpg
+++ b/examples/graphicsview/boxes/cubemap_posz.jpg
diff --git a/demos/boxes/dotted.fsh b/examples/graphicsview/boxes/dotted.fsh
index a9f1bcbefba..a9f1bcbefba 100644
--- a/demos/boxes/dotted.fsh
+++ b/examples/graphicsview/boxes/dotted.fsh
diff --git a/demos/boxes/fresnel.fsh b/examples/graphicsview/boxes/fresnel.fsh
index 462f9674f49..462f9674f49 100644
--- a/demos/boxes/fresnel.fsh
+++ b/examples/graphicsview/boxes/fresnel.fsh
diff --git a/demos/boxes/glass.fsh b/examples/graphicsview/boxes/glass.fsh
index aeac2c2fedf..aeac2c2fedf 100644
--- a/demos/boxes/glass.fsh
+++ b/examples/graphicsview/boxes/glass.fsh
diff --git a/demos/boxes/glbuffers.cpp b/examples/graphicsview/boxes/glbuffers.cpp
index e12132b4cd8..e12132b4cd8 100644
--- a/demos/boxes/glbuffers.cpp
+++ b/examples/graphicsview/boxes/glbuffers.cpp
diff --git a/demos/boxes/glbuffers.h b/examples/graphicsview/boxes/glbuffers.h
index 6b18d3f1282..6b18d3f1282 100644
--- a/demos/boxes/glbuffers.h
+++ b/examples/graphicsview/boxes/glbuffers.h
diff --git a/demos/boxes/glextensions.cpp b/examples/graphicsview/boxes/glextensions.cpp
index b712efe38b8..b712efe38b8 100644
--- a/demos/boxes/glextensions.cpp
+++ b/examples/graphicsview/boxes/glextensions.cpp
diff --git a/demos/boxes/glextensions.h b/examples/graphicsview/boxes/glextensions.h
index 54de548cd7e..54de548cd7e 100644
--- a/demos/boxes/glextensions.h
+++ b/examples/graphicsview/boxes/glextensions.h
diff --git a/demos/boxes/gltrianglemesh.h b/examples/graphicsview/boxes/gltrianglemesh.h
index ecf6531d85f..ecf6531d85f 100644
--- a/demos/boxes/gltrianglemesh.h
+++ b/examples/graphicsview/boxes/gltrianglemesh.h
diff --git a/demos/boxes/granite.fsh b/examples/graphicsview/boxes/granite.fsh
index abaeeb97bc7..abaeeb97bc7 100644
--- a/demos/boxes/granite.fsh
+++ b/examples/graphicsview/boxes/granite.fsh
diff --git a/demos/boxes/main.cpp b/examples/graphicsview/boxes/main.cpp
index 483170801f1..483170801f1 100644
--- a/demos/boxes/main.cpp
+++ b/examples/graphicsview/boxes/main.cpp
diff --git a/demos/boxes/marble.fsh b/examples/graphicsview/boxes/marble.fsh
index 170ec3abef6..170ec3abef6 100644
--- a/demos/boxes/marble.fsh
+++ b/examples/graphicsview/boxes/marble.fsh
diff --git a/demos/boxes/parameters.par b/examples/graphicsview/boxes/parameters.par
index 50e20739b98..50e20739b98 100644
--- a/demos/boxes/parameters.par
+++ b/examples/graphicsview/boxes/parameters.par
diff --git a/demos/boxes/qt-logo.jpg b/examples/graphicsview/boxes/qt-logo.jpg
index 4014b4659c1..4014b4659c1 100644
--- a/demos/boxes/qt-logo.jpg
+++ b/examples/graphicsview/boxes/qt-logo.jpg
diff --git a/demos/boxes/qt-logo.png b/examples/graphicsview/boxes/qt-logo.png
index 7d3e97eb36e..7d3e97eb36e 100644
--- a/demos/boxes/qt-logo.png
+++ b/examples/graphicsview/boxes/qt-logo.png
diff --git a/demos/boxes/qtbox.cpp b/examples/graphicsview/boxes/qtbox.cpp
index d24116578c9..d24116578c9 100644
--- a/demos/boxes/qtbox.cpp
+++ b/examples/graphicsview/boxes/qtbox.cpp
diff --git a/demos/boxes/qtbox.h b/examples/graphicsview/boxes/qtbox.h
index 56b86a55bba..56b86a55bba 100644
--- a/demos/boxes/qtbox.h
+++ b/examples/graphicsview/boxes/qtbox.h
diff --git a/demos/boxes/reflection.fsh b/examples/graphicsview/boxes/reflection.fsh
index 576c522bbbc..576c522bbbc 100644
--- a/demos/boxes/reflection.fsh
+++ b/examples/graphicsview/boxes/reflection.fsh
diff --git a/demos/boxes/refraction.fsh b/examples/graphicsview/boxes/refraction.fsh
index 10ab38a54c1..10ab38a54c1 100644
--- a/demos/boxes/refraction.fsh
+++ b/examples/graphicsview/boxes/refraction.fsh
diff --git a/demos/boxes/roundedbox.cpp b/examples/graphicsview/boxes/roundedbox.cpp
index 50580437076..50580437076 100644
--- a/demos/boxes/roundedbox.cpp
+++ b/examples/graphicsview/boxes/roundedbox.cpp
diff --git a/demos/boxes/roundedbox.h b/examples/graphicsview/boxes/roundedbox.h
index 54dda820008..54dda820008 100644
--- a/demos/boxes/roundedbox.h
+++ b/examples/graphicsview/boxes/roundedbox.h
diff --git a/demos/boxes/scene.cpp b/examples/graphicsview/boxes/scene.cpp
index 39cd0fcafda..39cd0fcafda 100644
--- a/demos/boxes/scene.cpp
+++ b/examples/graphicsview/boxes/scene.cpp
diff --git a/demos/boxes/scene.h b/examples/graphicsview/boxes/scene.h
index 96ee908d587..96ee908d587 100644
--- a/demos/boxes/scene.h
+++ b/examples/graphicsview/boxes/scene.h
diff --git a/demos/boxes/smiley.png b/examples/graphicsview/boxes/smiley.png
index 41cfda6b23d..41cfda6b23d 100644
--- a/demos/boxes/smiley.png
+++ b/examples/graphicsview/boxes/smiley.png
diff --git a/demos/boxes/square.jpg b/examples/graphicsview/boxes/square.jpg
index 03f53bd5306..03f53bd5306 100644
--- a/demos/boxes/square.jpg
+++ b/examples/graphicsview/boxes/square.jpg
diff --git a/demos/boxes/trackball.cpp b/examples/graphicsview/boxes/trackball.cpp
index 1bb864ce900..1bb864ce900 100644
--- a/demos/boxes/trackball.cpp
+++ b/examples/graphicsview/boxes/trackball.cpp
diff --git a/demos/boxes/trackball.h b/examples/graphicsview/boxes/trackball.h
index 097851a42c0..097851a42c0 100644
--- a/demos/boxes/trackball.h
+++ b/examples/graphicsview/boxes/trackball.h
diff --git a/demos/boxes/wood.fsh b/examples/graphicsview/boxes/wood.fsh
index 19950b252c6..19950b252c6 100644
--- a/demos/boxes/wood.fsh
+++ b/examples/graphicsview/boxes/wood.fsh
diff --git a/demos/chip/chip.cpp b/examples/graphicsview/chip/chip.cpp
index 21b63bae2cf..21b63bae2cf 100644
--- a/demos/chip/chip.cpp
+++ b/examples/graphicsview/chip/chip.cpp
diff --git a/demos/chip/chip.h b/examples/graphicsview/chip/chip.h
index ff9f6368436..ff9f6368436 100644
--- a/demos/chip/chip.h
+++ b/examples/graphicsview/chip/chip.h
diff --git a/demos/chip/chip.pro b/examples/graphicsview/chip/chip.pro
index 1e1a7de7354..1e1a7de7354 100644
--- a/demos/chip/chip.pro
+++ b/examples/graphicsview/chip/chip.pro
diff --git a/demos/chip/fileprint.png b/examples/graphicsview/chip/fileprint.png
index ba7c02dc18d..ba7c02dc18d 100644
--- a/demos/chip/fileprint.png
+++ b/examples/graphicsview/chip/fileprint.png
diff --git a/demos/chip/images.qrc b/examples/graphicsview/chip/images.qrc
index c7cdf0c4c07..c7cdf0c4c07 100644
--- a/demos/chip/images.qrc
+++ b/examples/graphicsview/chip/images.qrc
diff --git a/demos/chip/main.cpp b/examples/graphicsview/chip/main.cpp
index e983e4cca6b..e983e4cca6b 100644
--- a/demos/chip/main.cpp
+++ b/examples/graphicsview/chip/main.cpp
diff --git a/demos/chip/mainwindow.cpp b/examples/graphicsview/chip/mainwindow.cpp
index 7476c00ab1a..7476c00ab1a 100644
--- a/demos/chip/mainwindow.cpp
+++ b/examples/graphicsview/chip/mainwindow.cpp
diff --git a/demos/chip/mainwindow.h b/examples/graphicsview/chip/mainwindow.h
index 650e1f1f3c0..650e1f1f3c0 100644
--- a/demos/chip/mainwindow.h
+++ b/examples/graphicsview/chip/mainwindow.h
diff --git a/demos/chip/qt4logo.png b/examples/graphicsview/chip/qt4logo.png
index 157e86ed647..157e86ed647 100644
--- a/demos/chip/qt4logo.png
+++ b/examples/graphicsview/chip/qt4logo.png
diff --git a/demos/chip/rotateleft.png b/examples/graphicsview/chip/rotateleft.png
index 8cfa931986b..8cfa931986b 100644
--- a/demos/chip/rotateleft.png
+++ b/examples/graphicsview/chip/rotateleft.png
diff --git a/demos/chip/rotateright.png b/examples/graphicsview/chip/rotateright.png
index ec5e8664a13..ec5e8664a13 100644
--- a/demos/chip/rotateright.png
+++ b/examples/graphicsview/chip/rotateright.png
diff --git a/demos/chip/view.cpp b/examples/graphicsview/chip/view.cpp
index 5634f85d987..5634f85d987 100644
--- a/demos/chip/view.cpp
+++ b/examples/graphicsview/chip/view.cpp
diff --git a/demos/chip/view.h b/examples/graphicsview/chip/view.h
index 7c587d4147f..7c587d4147f 100644
--- a/demos/chip/view.h
+++ b/examples/graphicsview/chip/view.h
diff --git a/demos/chip/zoomin.png b/examples/graphicsview/chip/zoomin.png
index 8b0daeea480..8b0daeea480 100644
--- a/demos/chip/zoomin.png
+++ b/examples/graphicsview/chip/zoomin.png
diff --git a/demos/chip/zoomout.png b/examples/graphicsview/chip/zoomout.png
index 1575dd24f6d..1575dd24f6d 100644
--- a/demos/chip/zoomout.png
+++ b/examples/graphicsview/chip/zoomout.png
diff --git a/demos/embeddeddialogs/No-Ones-Laughing-3.jpg b/examples/graphicsview/embeddeddialogs/No-Ones-Laughing-3.jpg
index 445567fbdac..445567fbdac 100644
--- a/demos/embeddeddialogs/No-Ones-Laughing-3.jpg
+++ b/examples/graphicsview/embeddeddialogs/No-Ones-Laughing-3.jpg
diff --git a/demos/embeddeddialogs/customproxy.cpp b/examples/graphicsview/embeddeddialogs/customproxy.cpp
index cbc622a34f2..cbc622a34f2 100644
--- a/demos/embeddeddialogs/customproxy.cpp
+++ b/examples/graphicsview/embeddeddialogs/customproxy.cpp
diff --git a/demos/embeddeddialogs/customproxy.h b/examples/graphicsview/embeddeddialogs/customproxy.h
index 1ceaa06bb39..1ceaa06bb39 100644
--- a/demos/embeddeddialogs/customproxy.h
+++ b/examples/graphicsview/embeddeddialogs/customproxy.h
diff --git a/demos/embeddeddialogs/embeddeddialog.cpp b/examples/graphicsview/embeddeddialogs/embeddeddialog.cpp
index f9323079251..f9323079251 100644
--- a/demos/embeddeddialogs/embeddeddialog.cpp
+++ b/examples/graphicsview/embeddeddialogs/embeddeddialog.cpp
diff --git a/demos/embeddeddialogs/embeddeddialog.h b/examples/graphicsview/embeddeddialogs/embeddeddialog.h
index b7f8da085ee..b7f8da085ee 100644
--- a/demos/embeddeddialogs/embeddeddialog.h
+++ b/examples/graphicsview/embeddeddialogs/embeddeddialog.h
diff --git a/demos/embeddeddialogs/embeddeddialog.ui b/examples/graphicsview/embeddeddialogs/embeddeddialog.ui
index f967b100853..f967b100853 100644
--- a/demos/embeddeddialogs/embeddeddialog.ui
+++ b/examples/graphicsview/embeddeddialogs/embeddeddialog.ui
diff --git a/demos/embeddeddialogs/embeddeddialogs.pro b/examples/graphicsview/embeddeddialogs/embeddeddialogs.pro
index 675a9889a2d..675a9889a2d 100644
--- a/demos/embeddeddialogs/embeddeddialogs.pro
+++ b/examples/graphicsview/embeddeddialogs/embeddeddialogs.pro
diff --git a/demos/embeddeddialogs/embeddeddialogs.qrc b/examples/graphicsview/embeddeddialogs/embeddeddialogs.qrc
index 33be5038dab..33be5038dab 100644
--- a/demos/embeddeddialogs/embeddeddialogs.qrc
+++ b/examples/graphicsview/embeddeddialogs/embeddeddialogs.qrc
diff --git a/demos/embeddeddialogs/main.cpp b/examples/graphicsview/embeddeddialogs/main.cpp
index bca81b8c798..bca81b8c798 100644
--- a/demos/embeddeddialogs/main.cpp
+++ b/examples/graphicsview/embeddeddialogs/main.cpp
diff --git a/demos/interview/README b/examples/itemviews/interview/README
index 50894428f6e..50894428f6e 100644
--- a/demos/interview/README
+++ b/examples/itemviews/interview/README
diff --git a/demos/interview/images/folder.png b/examples/itemviews/interview/images/folder.png
index 589fd2df594..589fd2df594 100644
--- a/demos/interview/images/folder.png
+++ b/examples/itemviews/interview/images/folder.png
diff --git a/demos/interview/images/interview.png b/examples/itemviews/interview/images/interview.png
index 0c3d690258f..0c3d690258f 100644
--- a/demos/interview/images/interview.png
+++ b/examples/itemviews/interview/images/interview.png
diff --git a/demos/interview/images/services.png b/examples/itemviews/interview/images/services.png
index 6b2ad969d4d..6b2ad969d4d 100644
--- a/demos/interview/images/services.png
+++ b/examples/itemviews/interview/images/services.png
diff --git a/demos/interview/interview.pro b/examples/itemviews/interview/interview.pro
index a497fbc4077..a497fbc4077 100644
--- a/demos/interview/interview.pro
+++ b/examples/itemviews/interview/interview.pro
diff --git a/demos/interview/interview.qrc b/examples/itemviews/interview/interview.qrc
index b28ea34d8a7..b28ea34d8a7 100644
--- a/demos/interview/interview.qrc
+++ b/examples/itemviews/interview/interview.qrc
diff --git a/demos/interview/main.cpp b/examples/itemviews/interview/main.cpp
index b9656c61851..b9656c61851 100644
--- a/demos/interview/main.cpp
+++ b/examples/itemviews/interview/main.cpp
diff --git a/demos/interview/model.cpp b/examples/itemviews/interview/model.cpp
index 60316157117..60316157117 100644
--- a/demos/interview/model.cpp
+++ b/examples/itemviews/interview/model.cpp
diff --git a/demos/interview/model.h b/examples/itemviews/interview/model.h
index f0ae556ce3e..f0ae556ce3e 100644
--- a/demos/interview/model.h
+++ b/examples/itemviews/interview/model.h
diff --git a/demos/spreadsheet/images/interview.png b/examples/itemviews/spreadsheet/images/interview.png
index 0c3d690258f..0c3d690258f 100644
--- a/demos/spreadsheet/images/interview.png
+++ b/examples/itemviews/spreadsheet/images/interview.png
diff --git a/demos/spreadsheet/main.cpp b/examples/itemviews/spreadsheet/main.cpp
index 4c20646f9ca..4c20646f9ca 100644
--- a/demos/spreadsheet/main.cpp
+++ b/examples/itemviews/spreadsheet/main.cpp
diff --git a/demos/spreadsheet/printview.cpp b/examples/itemviews/spreadsheet/printview.cpp
index 0962e28844a..0962e28844a 100644
--- a/demos/spreadsheet/printview.cpp
+++ b/examples/itemviews/spreadsheet/printview.cpp
diff --git a/demos/spreadsheet/printview.h b/examples/itemviews/spreadsheet/printview.h
index 7c748444830..7c748444830 100644
--- a/demos/spreadsheet/printview.h
+++ b/examples/itemviews/spreadsheet/printview.h
diff --git a/demos/spreadsheet/spreadsheet.cpp b/examples/itemviews/spreadsheet/spreadsheet.cpp
index 6b99521b7bc..6b99521b7bc 100644
--- a/demos/spreadsheet/spreadsheet.cpp
+++ b/examples/itemviews/spreadsheet/spreadsheet.cpp
diff --git a/demos/spreadsheet/spreadsheet.h b/examples/itemviews/spreadsheet/spreadsheet.h
index 386a469c991..386a469c991 100644
--- a/demos/spreadsheet/spreadsheet.h
+++ b/examples/itemviews/spreadsheet/spreadsheet.h
diff --git a/demos/spreadsheet/spreadsheet.pro b/examples/itemviews/spreadsheet/spreadsheet.pro
index 7179d98ebad..7179d98ebad 100644
--- a/demos/spreadsheet/spreadsheet.pro
+++ b/examples/itemviews/spreadsheet/spreadsheet.pro
diff --git a/demos/spreadsheet/spreadsheet.qrc b/examples/itemviews/spreadsheet/spreadsheet.qrc
index 13f496d8e37..13f496d8e37 100644
--- a/demos/spreadsheet/spreadsheet.qrc
+++ b/examples/itemviews/spreadsheet/spreadsheet.qrc
diff --git a/demos/spreadsheet/spreadsheetdelegate.cpp b/examples/itemviews/spreadsheet/spreadsheetdelegate.cpp
index 6f2f2dd071b..6f2f2dd071b 100644
--- a/demos/spreadsheet/spreadsheetdelegate.cpp
+++ b/examples/itemviews/spreadsheet/spreadsheetdelegate.cpp
diff --git a/demos/spreadsheet/spreadsheetdelegate.h b/examples/itemviews/spreadsheet/spreadsheetdelegate.h
index 7987f35499d..7987f35499d 100644
--- a/demos/spreadsheet/spreadsheetdelegate.h
+++ b/examples/itemviews/spreadsheet/spreadsheetdelegate.h
diff --git a/demos/spreadsheet/spreadsheetitem.cpp b/examples/itemviews/spreadsheet/spreadsheetitem.cpp
index 74a1967a8ae..74a1967a8ae 100644
--- a/demos/spreadsheet/spreadsheetitem.cpp
+++ b/examples/itemviews/spreadsheet/spreadsheetitem.cpp
diff --git a/demos/spreadsheet/spreadsheetitem.h b/examples/itemviews/spreadsheet/spreadsheetitem.h
index b0e7e337ed5..b0e7e337ed5 100644
--- a/demos/spreadsheet/spreadsheetitem.h
+++ b/examples/itemviews/spreadsheet/spreadsheetitem.h
diff --git a/demos/macmainwindow/macmainwindow.h b/examples/mainwindows/macmainwindow/macmainwindow.h
index 10ff3b51474..10ff3b51474 100644
--- a/demos/macmainwindow/macmainwindow.h
+++ b/examples/mainwindows/macmainwindow/macmainwindow.h
diff --git a/demos/macmainwindow/macmainwindow.mm b/examples/mainwindows/macmainwindow/macmainwindow.mm
index 3b0ba6f02ad..3b0ba6f02ad 100644
--- a/demos/macmainwindow/macmainwindow.mm
+++ b/examples/mainwindows/macmainwindow/macmainwindow.mm
diff --git a/demos/macmainwindow/macmainwindow.pro b/examples/mainwindows/macmainwindow/macmainwindow.pro
index 435905612a0..435905612a0 100644
--- a/demos/macmainwindow/macmainwindow.pro
+++ b/examples/mainwindows/macmainwindow/macmainwindow.pro
diff --git a/demos/macmainwindow/main.cpp b/examples/mainwindows/macmainwindow/main.cpp
index 34e48470685..34e48470685 100644
--- a/demos/macmainwindow/main.cpp
+++ b/examples/mainwindows/macmainwindow/main.cpp
diff --git a/demos/mainwindow/colorswatch.cpp b/examples/mainwindows/mainwindow/colorswatch.cpp
index dd16fddbe7c..dd16fddbe7c 100644
--- a/demos/mainwindow/colorswatch.cpp
+++ b/examples/mainwindows/mainwindow/colorswatch.cpp
diff --git a/demos/mainwindow/colorswatch.h b/examples/mainwindows/mainwindow/colorswatch.h
index 555f1c6cd4d..555f1c6cd4d 100644
--- a/demos/mainwindow/colorswatch.h
+++ b/examples/mainwindows/mainwindow/colorswatch.h
diff --git a/demos/mainwindow/main.cpp b/examples/mainwindows/mainwindow/main.cpp
index 71cff13cb83..71cff13cb83 100644
--- a/demos/mainwindow/main.cpp
+++ b/examples/mainwindows/mainwindow/main.cpp
diff --git a/demos/mainwindow/mainwindow.cpp b/examples/mainwindows/mainwindow/mainwindow.cpp
index a58a713c0b3..a58a713c0b3 100644
--- a/demos/mainwindow/mainwindow.cpp
+++ b/examples/mainwindows/mainwindow/mainwindow.cpp
diff --git a/demos/mainwindow/mainwindow.h b/examples/mainwindows/mainwindow/mainwindow.h
index aa01ffa1312..aa01ffa1312 100644
--- a/demos/mainwindow/mainwindow.h
+++ b/examples/mainwindows/mainwindow/mainwindow.h
diff --git a/demos/mainwindow/mainwindow.pro b/examples/mainwindows/mainwindow/mainwindow.pro
index 6da113d7220..6da113d7220 100644
--- a/demos/mainwindow/mainwindow.pro
+++ b/examples/mainwindows/mainwindow/mainwindow.pro
diff --git a/demos/mainwindow/mainwindow.qrc b/examples/mainwindows/mainwindow/mainwindow.qrc
index 47ff22a3e49..47ff22a3e49 100644
--- a/demos/mainwindow/mainwindow.qrc
+++ b/examples/mainwindows/mainwindow/mainwindow.qrc
diff --git a/demos/mainwindow/qt.png b/examples/mainwindows/mainwindow/qt.png
index 48fa9fc2efa..48fa9fc2efa 100644
--- a/demos/mainwindow/qt.png
+++ b/examples/mainwindows/mainwindow/qt.png
diff --git a/demos/mainwindow/titlebarCenter.png b/examples/mainwindows/mainwindow/titlebarCenter.png
index 5cc141355cb..5cc141355cb 100644
--- a/demos/mainwindow/titlebarCenter.png
+++ b/examples/mainwindows/mainwindow/titlebarCenter.png
diff --git a/demos/mainwindow/titlebarLeft.png b/examples/mainwindows/mainwindow/titlebarLeft.png
index 315166202b7..315166202b7 100644
--- a/demos/mainwindow/titlebarLeft.png
+++ b/examples/mainwindows/mainwindow/titlebarLeft.png
diff --git a/demos/mainwindow/titlebarRight.png b/examples/mainwindows/mainwindow/titlebarRight.png
index a4505268ec1..a4505268ec1 100644
--- a/demos/mainwindow/titlebarRight.png
+++ b/examples/mainwindows/mainwindow/titlebarRight.png
diff --git a/demos/mainwindow/toolbar.cpp b/examples/mainwindows/mainwindow/toolbar.cpp
index 1176ee54803..1176ee54803 100644
--- a/demos/mainwindow/toolbar.cpp
+++ b/examples/mainwindows/mainwindow/toolbar.cpp
diff --git a/demos/mainwindow/toolbar.h b/examples/mainwindows/mainwindow/toolbar.h
index 5b982ee73b4..5b982ee73b4 100644
--- a/demos/mainwindow/toolbar.h
+++ b/examples/mainwindows/mainwindow/toolbar.h
diff --git a/demos/composition/composition.cpp b/examples/painting/composition/composition.cpp
index b3f810b26cd..b3f810b26cd 100644
--- a/demos/composition/composition.cpp
+++ b/examples/painting/composition/composition.cpp
diff --git a/demos/composition/composition.h b/examples/painting/composition/composition.h
index 86e8f5c0dfa..86e8f5c0dfa 100644
--- a/demos/composition/composition.h
+++ b/examples/painting/composition/composition.h
diff --git a/demos/composition/composition.html b/examples/painting/composition/composition.html
index 1848ad8bd12..1848ad8bd12 100644
--- a/demos/composition/composition.html
+++ b/examples/painting/composition/composition.html
diff --git a/demos/composition/composition.pro b/examples/painting/composition/composition.pro
index 59b91126b90..59b91126b90 100644
--- a/demos/composition/composition.pro
+++ b/examples/painting/composition/composition.pro
diff --git a/demos/composition/composition.qrc b/examples/painting/composition/composition.qrc
index d02c397ee83..d02c397ee83 100644
--- a/demos/composition/composition.qrc
+++ b/examples/painting/composition/composition.qrc
diff --git a/demos/composition/flower.jpg b/examples/painting/composition/flower.jpg
index f8e022c98cb..f8e022c98cb 100644
--- a/demos/composition/flower.jpg
+++ b/examples/painting/composition/flower.jpg
diff --git a/demos/composition/flower_alpha.jpg b/examples/painting/composition/flower_alpha.jpg
index 6a3c2a02ef3..6a3c2a02ef3 100644
--- a/demos/composition/flower_alpha.jpg
+++ b/examples/painting/composition/flower_alpha.jpg
diff --git a/demos/composition/main.cpp b/examples/painting/composition/main.cpp
index d6bc170a978..d6bc170a978 100644
--- a/demos/composition/main.cpp
+++ b/examples/painting/composition/main.cpp
diff --git a/demos/deform/deform.pro b/examples/painting/deform/deform.pro
index 3393b8e83c5..3393b8e83c5 100644
--- a/demos/deform/deform.pro
+++ b/examples/painting/deform/deform.pro
diff --git a/demos/deform/deform.qrc b/examples/painting/deform/deform.qrc
index 2e59ebcfc5b..2e59ebcfc5b 100644
--- a/demos/deform/deform.qrc
+++ b/examples/painting/deform/deform.qrc
diff --git a/demos/deform/main.cpp b/examples/painting/deform/main.cpp
index c49117a2f2a..c49117a2f2a 100644
--- a/demos/deform/main.cpp
+++ b/examples/painting/deform/main.cpp
diff --git a/demos/deform/pathdeform.cpp b/examples/painting/deform/pathdeform.cpp
index f80ef2b8bec..f80ef2b8bec 100644
--- a/demos/deform/pathdeform.cpp
+++ b/examples/painting/deform/pathdeform.cpp
diff --git a/demos/deform/pathdeform.h b/examples/painting/deform/pathdeform.h
index 73a1955082c..73a1955082c 100644
--- a/demos/deform/pathdeform.h
+++ b/examples/painting/deform/pathdeform.h
diff --git a/demos/deform/pathdeform.html b/examples/painting/deform/pathdeform.html
index b3f63a8e0ad..b3f63a8e0ad 100644
--- a/demos/deform/pathdeform.html
+++ b/examples/painting/deform/pathdeform.html
diff --git a/demos/gradients/gradients.cpp b/examples/painting/gradients/gradients.cpp
index d8b739b3b0d..d8b739b3b0d 100644
--- a/demos/gradients/gradients.cpp
+++ b/examples/painting/gradients/gradients.cpp
diff --git a/demos/gradients/gradients.h b/examples/painting/gradients/gradients.h
index e1a2bcb41ec..e1a2bcb41ec 100644
--- a/demos/gradients/gradients.h
+++ b/examples/painting/gradients/gradients.h
diff --git a/demos/gradients/gradients.html b/examples/painting/gradients/gradients.html
index 1ea2c0ed6c7..1ea2c0ed6c7 100644
--- a/demos/gradients/gradients.html
+++ b/examples/painting/gradients/gradients.html
diff --git a/demos/gradients/gradients.pro b/examples/painting/gradients/gradients.pro
index ed4120e01c8..ed4120e01c8 100644
--- a/demos/gradients/gradients.pro
+++ b/examples/painting/gradients/gradients.pro
diff --git a/demos/gradients/gradients.qrc b/examples/painting/gradients/gradients.qrc
index fb971eb17b9..fb971eb17b9 100644
--- a/demos/gradients/gradients.qrc
+++ b/examples/painting/gradients/gradients.qrc
diff --git a/demos/gradients/main.cpp b/examples/painting/gradients/main.cpp
index 1d2f0d57750..1d2f0d57750 100644
--- a/demos/gradients/main.cpp
+++ b/examples/painting/gradients/main.cpp
diff --git a/demos/pathstroke/main.cpp b/examples/painting/pathstroke/main.cpp
index b357f993367..b357f993367 100644
--- a/demos/pathstroke/main.cpp
+++ b/examples/painting/pathstroke/main.cpp
diff --git a/demos/pathstroke/pathstroke.cpp b/examples/painting/pathstroke/pathstroke.cpp
index 02c35f77219..02c35f77219 100644
--- a/demos/pathstroke/pathstroke.cpp
+++ b/examples/painting/pathstroke/pathstroke.cpp
diff --git a/demos/pathstroke/pathstroke.h b/examples/painting/pathstroke/pathstroke.h
index f0360b66483..f0360b66483 100644
--- a/demos/pathstroke/pathstroke.h
+++ b/examples/painting/pathstroke/pathstroke.h
diff --git a/demos/pathstroke/pathstroke.html b/examples/painting/pathstroke/pathstroke.html
index 9e7e50de764..9e7e50de764 100644
--- a/demos/pathstroke/pathstroke.html
+++ b/examples/painting/pathstroke/pathstroke.html
diff --git a/demos/pathstroke/pathstroke.pro b/examples/painting/pathstroke/pathstroke.pro
index 9bbf8a6f77c..9bbf8a6f77c 100644
--- a/demos/pathstroke/pathstroke.pro
+++ b/examples/painting/pathstroke/pathstroke.pro
diff --git a/demos/pathstroke/pathstroke.qrc b/examples/painting/pathstroke/pathstroke.qrc
index a9a723409e0..a9a723409e0 100644
--- a/demos/pathstroke/pathstroke.qrc
+++ b/examples/painting/pathstroke/pathstroke.qrc
diff --git a/demos/shared/arthurstyle.cpp b/examples/painting/shared/arthurstyle.cpp
index 432b8b34e50..432b8b34e50 100644
--- a/demos/shared/arthurstyle.cpp
+++ b/examples/painting/shared/arthurstyle.cpp
diff --git a/demos/shared/arthurstyle.h b/examples/painting/shared/arthurstyle.h
index 32c7fad970c..32c7fad970c 100644
--- a/demos/shared/arthurstyle.h
+++ b/examples/painting/shared/arthurstyle.h
diff --git a/demos/shared/arthurwidgets.cpp b/examples/painting/shared/arthurwidgets.cpp
index b3c75f0fc4a..b3c75f0fc4a 100644
--- a/demos/shared/arthurwidgets.cpp
+++ b/examples/painting/shared/arthurwidgets.cpp
diff --git a/demos/shared/arthurwidgets.h b/examples/painting/shared/arthurwidgets.h
index dc8f92505d3..dc8f92505d3 100644
--- a/demos/shared/arthurwidgets.h
+++ b/examples/painting/shared/arthurwidgets.h
diff --git a/demos/shared/hoverpoints.cpp b/examples/painting/shared/hoverpoints.cpp
index 36c24186d3d..36c24186d3d 100644
--- a/demos/shared/hoverpoints.cpp
+++ b/examples/painting/shared/hoverpoints.cpp
diff --git a/demos/shared/hoverpoints.h b/examples/painting/shared/hoverpoints.h
index aff5d2ac753..aff5d2ac753 100644
--- a/demos/shared/hoverpoints.h
+++ b/examples/painting/shared/hoverpoints.h
diff --git a/demos/shared/images/bg_pattern.png b/examples/painting/shared/images/bg_pattern.png
index ee670266f03..ee670266f03 100644
--- a/demos/shared/images/bg_pattern.png
+++ b/examples/painting/shared/images/bg_pattern.png
diff --git a/demos/shared/images/button_normal_cap_left.png b/examples/painting/shared/images/button_normal_cap_left.png
index db31dd971d4..db31dd971d4 100644
--- a/demos/shared/images/button_normal_cap_left.png
+++ b/examples/painting/shared/images/button_normal_cap_left.png
diff --git a/demos/shared/images/button_normal_cap_right.png b/examples/painting/shared/images/button_normal_cap_right.png
index 38ead1c7191..38ead1c7191 100644
--- a/demos/shared/images/button_normal_cap_right.png
+++ b/examples/painting/shared/images/button_normal_cap_right.png
diff --git a/demos/shared/images/button_normal_stretch.png b/examples/painting/shared/images/button_normal_stretch.png
index 87abe67ac90..87abe67ac90 100644
--- a/demos/shared/images/button_normal_stretch.png
+++ b/examples/painting/shared/images/button_normal_stretch.png
diff --git a/demos/shared/images/button_pressed_cap_left.png b/examples/painting/shared/images/button_pressed_cap_left.png
index 66bfc13cb48..66bfc13cb48 100644
--- a/demos/shared/images/button_pressed_cap_left.png
+++ b/examples/painting/shared/images/button_pressed_cap_left.png
diff --git a/demos/shared/images/button_pressed_cap_right.png b/examples/painting/shared/images/button_pressed_cap_right.png
index 3d4cfe25b14..3d4cfe25b14 100644
--- a/demos/shared/images/button_pressed_cap_right.png
+++ b/examples/painting/shared/images/button_pressed_cap_right.png
diff --git a/demos/shared/images/button_pressed_stretch.png b/examples/painting/shared/images/button_pressed_stretch.png
index 4dd4ad11e6f..4dd4ad11e6f 100644
--- a/demos/shared/images/button_pressed_stretch.png
+++ b/examples/painting/shared/images/button_pressed_stretch.png
diff --git a/demos/shared/images/curve_thing_edit-6.png b/examples/painting/shared/images/curve_thing_edit-6.png
index 034b474d02e..034b474d02e 100644
--- a/demos/shared/images/curve_thing_edit-6.png
+++ b/examples/painting/shared/images/curve_thing_edit-6.png
diff --git a/demos/shared/images/frame_bottom.png b/examples/painting/shared/images/frame_bottom.png
index 889b40d3044..889b40d3044 100644
--- a/demos/shared/images/frame_bottom.png
+++ b/examples/painting/shared/images/frame_bottom.png
diff --git a/demos/shared/images/frame_bottomleft.png b/examples/painting/shared/images/frame_bottomleft.png
index 0b3023f3975..0b3023f3975 100644
--- a/demos/shared/images/frame_bottomleft.png
+++ b/examples/painting/shared/images/frame_bottomleft.png
diff --git a/demos/shared/images/frame_bottomright.png b/examples/painting/shared/images/frame_bottomright.png
index 0021e35864c..0021e35864c 100644
--- a/demos/shared/images/frame_bottomright.png
+++ b/examples/painting/shared/images/frame_bottomright.png
diff --git a/demos/shared/images/frame_left.png b/examples/painting/shared/images/frame_left.png
index 40f331c2931..40f331c2931 100644
--- a/demos/shared/images/frame_left.png
+++ b/examples/painting/shared/images/frame_left.png
diff --git a/demos/shared/images/frame_right.png b/examples/painting/shared/images/frame_right.png
index 023af8c700b..023af8c700b 100644
--- a/demos/shared/images/frame_right.png
+++ b/examples/painting/shared/images/frame_right.png
diff --git a/demos/shared/images/frame_top.png b/examples/painting/shared/images/frame_top.png
index 001f3a71440..001f3a71440 100644
--- a/demos/shared/images/frame_top.png
+++ b/examples/painting/shared/images/frame_top.png
diff --git a/demos/shared/images/frame_topleft.png b/examples/painting/shared/images/frame_topleft.png
index 58c68d407ad..58c68d407ad 100644
--- a/demos/shared/images/frame_topleft.png
+++ b/examples/painting/shared/images/frame_topleft.png
diff --git a/demos/shared/images/frame_topright.png b/examples/painting/shared/images/frame_topright.png
index 6a7e8d3eb3e..6a7e8d3eb3e 100644
--- a/demos/shared/images/frame_topright.png
+++ b/examples/painting/shared/images/frame_topright.png
diff --git a/demos/shared/images/groupframe_bottom_left.png b/examples/painting/shared/images/groupframe_bottom_left.png
index af2fe061e3d..af2fe061e3d 100644
--- a/demos/shared/images/groupframe_bottom_left.png
+++ b/examples/painting/shared/images/groupframe_bottom_left.png
diff --git a/demos/shared/images/groupframe_bottom_right.png b/examples/painting/shared/images/groupframe_bottom_right.png
index fdf2e97b13b..fdf2e97b13b 100644
--- a/demos/shared/images/groupframe_bottom_right.png
+++ b/examples/painting/shared/images/groupframe_bottom_right.png
diff --git a/demos/shared/images/groupframe_bottom_stretch.png b/examples/painting/shared/images/groupframe_bottom_stretch.png
index f47b67d7c09..f47b67d7c09 100644
--- a/demos/shared/images/groupframe_bottom_stretch.png
+++ b/examples/painting/shared/images/groupframe_bottom_stretch.png
diff --git a/demos/shared/images/groupframe_left_stretch.png b/examples/painting/shared/images/groupframe_left_stretch.png
index c122f462ed2..c122f462ed2 100644
--- a/demos/shared/images/groupframe_left_stretch.png
+++ b/examples/painting/shared/images/groupframe_left_stretch.png
diff --git a/demos/shared/images/groupframe_right_stretch.png b/examples/painting/shared/images/groupframe_right_stretch.png
index 1056b7812a4..1056b7812a4 100644
--- a/demos/shared/images/groupframe_right_stretch.png
+++ b/examples/painting/shared/images/groupframe_right_stretch.png
diff --git a/demos/shared/images/groupframe_top_stretch.png b/examples/painting/shared/images/groupframe_top_stretch.png
index 5746ef96fcd..5746ef96fcd 100644
--- a/demos/shared/images/groupframe_top_stretch.png
+++ b/examples/painting/shared/images/groupframe_top_stretch.png
diff --git a/demos/shared/images/groupframe_topleft.png b/examples/painting/shared/images/groupframe_topleft.png
index 98d9cd96b46..98d9cd96b46 100644
--- a/demos/shared/images/groupframe_topleft.png
+++ b/examples/painting/shared/images/groupframe_topleft.png
diff --git a/demos/shared/images/groupframe_topright.png b/examples/painting/shared/images/groupframe_topright.png
index 1a0a328c201..1a0a328c201 100644
--- a/demos/shared/images/groupframe_topright.png
+++ b/examples/painting/shared/images/groupframe_topright.png
diff --git a/demos/shared/images/line_dash_dot.png b/examples/painting/shared/images/line_dash_dot.png
index 1c61442d9f3..1c61442d9f3 100644
--- a/demos/shared/images/line_dash_dot.png
+++ b/examples/painting/shared/images/line_dash_dot.png
diff --git a/demos/shared/images/line_dash_dot_dot.png b/examples/painting/shared/images/line_dash_dot_dot.png
index 0d9bb972f9e..0d9bb972f9e 100644
--- a/demos/shared/images/line_dash_dot_dot.png
+++ b/examples/painting/shared/images/line_dash_dot_dot.png
diff --git a/demos/shared/images/line_dashed.png b/examples/painting/shared/images/line_dashed.png
index d5bc7ea5fe5..d5bc7ea5fe5 100644
--- a/demos/shared/images/line_dashed.png
+++ b/examples/painting/shared/images/line_dashed.png
diff --git a/demos/shared/images/line_dotted.png b/examples/painting/shared/images/line_dotted.png
index a2f9a359257..a2f9a359257 100644
--- a/demos/shared/images/line_dotted.png
+++ b/examples/painting/shared/images/line_dotted.png
diff --git a/demos/shared/images/line_solid.png b/examples/painting/shared/images/line_solid.png
index 60ef3f94857..60ef3f94857 100644
--- a/demos/shared/images/line_solid.png
+++ b/examples/painting/shared/images/line_solid.png
diff --git a/demos/shared/images/radiobutton-off.png b/examples/painting/shared/images/radiobutton-off.png
index af1753a3e71..af1753a3e71 100644
--- a/demos/shared/images/radiobutton-off.png
+++ b/examples/painting/shared/images/radiobutton-off.png
diff --git a/demos/shared/images/radiobutton-on.png b/examples/painting/shared/images/radiobutton-on.png
index f875838bb51..f875838bb51 100644
--- a/demos/shared/images/radiobutton-on.png
+++ b/examples/painting/shared/images/radiobutton-on.png
diff --git a/demos/shared/images/radiobutton_off.png b/examples/painting/shared/images/radiobutton_off.png
index 400906ebfad..400906ebfad 100644
--- a/demos/shared/images/radiobutton_off.png
+++ b/examples/painting/shared/images/radiobutton_off.png
diff --git a/demos/shared/images/radiobutton_on.png b/examples/painting/shared/images/radiobutton_on.png
index 50a049ec56c..50a049ec56c 100644
--- a/demos/shared/images/radiobutton_on.png
+++ b/examples/painting/shared/images/radiobutton_on.png
diff --git a/demos/shared/images/slider_bar.png b/examples/painting/shared/images/slider_bar.png
index 1b3d62c0079..1b3d62c0079 100644
--- a/demos/shared/images/slider_bar.png
+++ b/examples/painting/shared/images/slider_bar.png
diff --git a/demos/shared/images/slider_thumb_off.png b/examples/painting/shared/images/slider_thumb_off.png
index d7f141daef6..d7f141daef6 100644
--- a/demos/shared/images/slider_thumb_off.png
+++ b/examples/painting/shared/images/slider_thumb_off.png
diff --git a/demos/shared/images/slider_thumb_on.png b/examples/painting/shared/images/slider_thumb_on.png
index 8e1f510813e..8e1f510813e 100644
--- a/demos/shared/images/slider_thumb_on.png
+++ b/examples/painting/shared/images/slider_thumb_on.png
diff --git a/demos/shared/images/title_cap_left.png b/examples/painting/shared/images/title_cap_left.png
index 2d475070c8d..2d475070c8d 100644
--- a/demos/shared/images/title_cap_left.png
+++ b/examples/painting/shared/images/title_cap_left.png
diff --git a/demos/shared/images/title_cap_right.png b/examples/painting/shared/images/title_cap_right.png
index dc3ff8536c7..dc3ff8536c7 100644
--- a/demos/shared/images/title_cap_right.png
+++ b/examples/painting/shared/images/title_cap_right.png
diff --git a/demos/shared/images/title_stretch.png b/examples/painting/shared/images/title_stretch.png
index 11043345d05..11043345d05 100644
--- a/demos/shared/images/title_stretch.png
+++ b/examples/painting/shared/images/title_stretch.png
diff --git a/demos/shared/shared.pri b/examples/painting/shared/shared.pri
index fb7b04c0be2..fb7b04c0be2 100644
--- a/demos/shared/shared.pri
+++ b/examples/painting/shared/shared.pri
diff --git a/demos/shared/shared.pro b/examples/painting/shared/shared.pro
index 88d7fbedaba..88d7fbedaba 100644
--- a/demos/shared/shared.pro
+++ b/examples/painting/shared/shared.pro
diff --git a/demos/shared/shared.qrc b/examples/painting/shared/shared.qrc
index 17336ecf80c..17336ecf80c 100644
--- a/demos/shared/shared.qrc
+++ b/examples/painting/shared/shared.qrc
diff --git a/demos/textedit/example.html b/examples/richtext/textedit/example.html
index 6327b5f8fc6..6327b5f8fc6 100644
--- a/demos/textedit/example.html
+++ b/examples/richtext/textedit/example.html
diff --git a/demos/textedit/images/logo32.png b/examples/richtext/textedit/images/logo32.png
index 5f91e9873b7..5f91e9873b7 100644
--- a/demos/textedit/images/logo32.png
+++ b/examples/richtext/textedit/images/logo32.png
diff --git a/demos/textedit/images/mac/editcopy.png b/examples/richtext/textedit/images/mac/editcopy.png
index f551364464a..f551364464a 100644
--- a/demos/textedit/images/mac/editcopy.png
+++ b/examples/richtext/textedit/images/mac/editcopy.png
diff --git a/demos/textedit/images/mac/editcut.png b/examples/richtext/textedit/images/mac/editcut.png
index a784fd5709d..a784fd5709d 100644
--- a/demos/textedit/images/mac/editcut.png
+++ b/examples/richtext/textedit/images/mac/editcut.png
diff --git a/demos/textedit/images/mac/editpaste.png b/examples/richtext/textedit/images/mac/editpaste.png
index 64c0b2d6ab8..64c0b2d6ab8 100644
--- a/demos/textedit/images/mac/editpaste.png
+++ b/examples/richtext/textedit/images/mac/editpaste.png
diff --git a/demos/textedit/images/mac/editredo.png b/examples/richtext/textedit/images/mac/editredo.png
index 8875bf246c5..8875bf246c5 100644
--- a/demos/textedit/images/mac/editredo.png
+++ b/examples/richtext/textedit/images/mac/editredo.png
diff --git a/demos/textedit/images/mac/editundo.png b/examples/richtext/textedit/images/mac/editundo.png
index a3bd5e0bf21..a3bd5e0bf21 100644
--- a/demos/textedit/images/mac/editundo.png
+++ b/examples/richtext/textedit/images/mac/editundo.png
diff --git a/demos/textedit/images/mac/exportpdf.png b/examples/richtext/textedit/images/mac/exportpdf.png
index ebb44e6b882..ebb44e6b882 100644
--- a/demos/textedit/images/mac/exportpdf.png
+++ b/examples/richtext/textedit/images/mac/exportpdf.png
diff --git a/demos/textedit/images/mac/filenew.png b/examples/richtext/textedit/images/mac/filenew.png
index d3882c7b3fe..d3882c7b3fe 100644
--- a/demos/textedit/images/mac/filenew.png
+++ b/examples/richtext/textedit/images/mac/filenew.png
diff --git a/demos/textedit/images/mac/fileopen.png b/examples/richtext/textedit/images/mac/fileopen.png
index fc06c5ec63e..fc06c5ec63e 100644
--- a/demos/textedit/images/mac/fileopen.png
+++ b/examples/richtext/textedit/images/mac/fileopen.png
diff --git a/demos/textedit/images/mac/fileprint.png b/examples/richtext/textedit/images/mac/fileprint.png
index 10ca56c82ae..10ca56c82ae 100644
--- a/demos/textedit/images/mac/fileprint.png
+++ b/examples/richtext/textedit/images/mac/fileprint.png
diff --git a/demos/textedit/images/mac/filesave.png b/examples/richtext/textedit/images/mac/filesave.png
index b41ecf53198..b41ecf53198 100644
--- a/demos/textedit/images/mac/filesave.png
+++ b/examples/richtext/textedit/images/mac/filesave.png
diff --git a/demos/textedit/images/mac/textbold.png b/examples/richtext/textedit/images/mac/textbold.png
index 38400bd1f69..38400bd1f69 100644
--- a/demos/textedit/images/mac/textbold.png
+++ b/examples/richtext/textedit/images/mac/textbold.png
diff --git a/demos/textedit/images/mac/textcenter.png b/examples/richtext/textedit/images/mac/textcenter.png
index 2ef5b2ee6f3..2ef5b2ee6f3 100644
--- a/demos/textedit/images/mac/textcenter.png
+++ b/examples/richtext/textedit/images/mac/textcenter.png
diff --git a/demos/textedit/images/mac/textitalic.png b/examples/richtext/textedit/images/mac/textitalic.png
index 0170ee26a6f..0170ee26a6f 100644
--- a/demos/textedit/images/mac/textitalic.png
+++ b/examples/richtext/textedit/images/mac/textitalic.png
diff --git a/demos/textedit/images/mac/textjustify.png b/examples/richtext/textedit/images/mac/textjustify.png
index 39cd6c1a9d7..39cd6c1a9d7 100644
--- a/demos/textedit/images/mac/textjustify.png
+++ b/examples/richtext/textedit/images/mac/textjustify.png
diff --git a/demos/textedit/images/mac/textleft.png b/examples/richtext/textedit/images/mac/textleft.png
index 83a66d55355..83a66d55355 100644
--- a/demos/textedit/images/mac/textleft.png
+++ b/examples/richtext/textedit/images/mac/textleft.png
diff --git a/demos/textedit/images/mac/textright.png b/examples/richtext/textedit/images/mac/textright.png
index e7c04645cf4..e7c04645cf4 100644
--- a/demos/textedit/images/mac/textright.png
+++ b/examples/richtext/textedit/images/mac/textright.png
diff --git a/demos/textedit/images/mac/textunder.png b/examples/richtext/textedit/images/mac/textunder.png
index 968bac5e90e..968bac5e90e 100644
--- a/demos/textedit/images/mac/textunder.png
+++ b/examples/richtext/textedit/images/mac/textunder.png
diff --git a/demos/textedit/images/mac/zoomin.png b/examples/richtext/textedit/images/mac/zoomin.png
index d46f5aff0d9..d46f5aff0d9 100644
--- a/demos/textedit/images/mac/zoomin.png
+++ b/examples/richtext/textedit/images/mac/zoomin.png
diff --git a/demos/textedit/images/mac/zoomout.png b/examples/richtext/textedit/images/mac/zoomout.png
index 46326566d11..46326566d11 100644
--- a/demos/textedit/images/mac/zoomout.png
+++ b/examples/richtext/textedit/images/mac/zoomout.png
diff --git a/demos/textedit/images/win/editcopy.png b/examples/richtext/textedit/images/win/editcopy.png
index 1121b47d8b6..1121b47d8b6 100644
--- a/demos/textedit/images/win/editcopy.png
+++ b/examples/richtext/textedit/images/win/editcopy.png
diff --git a/demos/textedit/images/win/editcut.png b/examples/richtext/textedit/images/win/editcut.png
index 38e55f7420e..38e55f7420e 100644
--- a/demos/textedit/images/win/editcut.png
+++ b/examples/richtext/textedit/images/win/editcut.png
diff --git a/demos/textedit/images/win/editpaste.png b/examples/richtext/textedit/images/win/editpaste.png
index ffab15aaf8d..ffab15aaf8d 100644
--- a/demos/textedit/images/win/editpaste.png
+++ b/examples/richtext/textedit/images/win/editpaste.png
diff --git a/demos/textedit/images/win/editredo.png b/examples/richtext/textedit/images/win/editredo.png
index 9d679fe6fcb..9d679fe6fcb 100644
--- a/demos/textedit/images/win/editredo.png
+++ b/examples/richtext/textedit/images/win/editredo.png
diff --git a/demos/textedit/images/win/editundo.png b/examples/richtext/textedit/images/win/editundo.png
index eee23d24a31..eee23d24a31 100644
--- a/demos/textedit/images/win/editundo.png
+++ b/examples/richtext/textedit/images/win/editundo.png
diff --git a/demos/textedit/images/win/exportpdf.png b/examples/richtext/textedit/images/win/exportpdf.png
index eef5132928b..eef5132928b 100644
--- a/demos/textedit/images/win/exportpdf.png
+++ b/examples/richtext/textedit/images/win/exportpdf.png
diff --git a/demos/textedit/images/win/filenew.png b/examples/richtext/textedit/images/win/filenew.png
index af5d1221412..af5d1221412 100644
--- a/demos/textedit/images/win/filenew.png
+++ b/examples/richtext/textedit/images/win/filenew.png
diff --git a/demos/textedit/images/win/fileopen.png b/examples/richtext/textedit/images/win/fileopen.png
index fc6f17e9774..fc6f17e9774 100644
--- a/demos/textedit/images/win/fileopen.png
+++ b/examples/richtext/textedit/images/win/fileopen.png
diff --git a/demos/textedit/images/win/fileprint.png b/examples/richtext/textedit/images/win/fileprint.png
index ba7c02dc18d..ba7c02dc18d 100644
--- a/demos/textedit/images/win/fileprint.png
+++ b/examples/richtext/textedit/images/win/fileprint.png
diff --git a/demos/textedit/images/win/filesave.png b/examples/richtext/textedit/images/win/filesave.png
index 8feec99bee8..8feec99bee8 100644
--- a/demos/textedit/images/win/filesave.png
+++ b/examples/richtext/textedit/images/win/filesave.png
diff --git a/demos/textedit/images/win/textbold.png b/examples/richtext/textedit/images/win/textbold.png
index 9cbc7138b90..9cbc7138b90 100644
--- a/demos/textedit/images/win/textbold.png
+++ b/examples/richtext/textedit/images/win/textbold.png
diff --git a/demos/textedit/images/win/textcenter.png b/examples/richtext/textedit/images/win/textcenter.png
index 11efb4b8524..11efb4b8524 100644
--- a/demos/textedit/images/win/textcenter.png
+++ b/examples/richtext/textedit/images/win/textcenter.png
diff --git a/demos/textedit/images/win/textitalic.png b/examples/richtext/textedit/images/win/textitalic.png
index b30ce14c14d..b30ce14c14d 100644
--- a/demos/textedit/images/win/textitalic.png
+++ b/examples/richtext/textedit/images/win/textitalic.png
diff --git a/demos/textedit/images/win/textjustify.png b/examples/richtext/textedit/images/win/textjustify.png
index 9de0c880850..9de0c880850 100644
--- a/demos/textedit/images/win/textjustify.png
+++ b/examples/richtext/textedit/images/win/textjustify.png
diff --git a/demos/textedit/images/win/textleft.png b/examples/richtext/textedit/images/win/textleft.png
index 16f80bc3258..16f80bc3258 100644
--- a/demos/textedit/images/win/textleft.png
+++ b/examples/richtext/textedit/images/win/textleft.png
diff --git a/demos/textedit/images/win/textright.png b/examples/richtext/textedit/images/win/textright.png
index 16872df62a9..16872df62a9 100644
--- a/demos/textedit/images/win/textright.png
+++ b/examples/richtext/textedit/images/win/textright.png
diff --git a/demos/textedit/images/win/textunder.png b/examples/richtext/textedit/images/win/textunder.png
index c72eff53fba..c72eff53fba 100644
--- a/demos/textedit/images/win/textunder.png
+++ b/examples/richtext/textedit/images/win/textunder.png
diff --git a/demos/textedit/images/win/zoomin.png b/examples/richtext/textedit/images/win/zoomin.png
index 2e586fc7bfb..2e586fc7bfb 100644
--- a/demos/textedit/images/win/zoomin.png
+++ b/examples/richtext/textedit/images/win/zoomin.png
diff --git a/demos/textedit/images/win/zoomout.png b/examples/richtext/textedit/images/win/zoomout.png
index a736d393435..a736d393435 100644
--- a/demos/textedit/images/win/zoomout.png
+++ b/examples/richtext/textedit/images/win/zoomout.png
diff --git a/demos/textedit/main.cpp b/examples/richtext/textedit/main.cpp
index 036fa80ba7d..036fa80ba7d 100644
--- a/demos/textedit/main.cpp
+++ b/examples/richtext/textedit/main.cpp
diff --git a/demos/textedit/textedit.cpp b/examples/richtext/textedit/textedit.cpp
index c8373262c95..c8373262c95 100644
--- a/demos/textedit/textedit.cpp
+++ b/examples/richtext/textedit/textedit.cpp
diff --git a/demos/textedit/textedit.h b/examples/richtext/textedit/textedit.h
index 6436178ab58..6436178ab58 100644
--- a/demos/textedit/textedit.h
+++ b/examples/richtext/textedit/textedit.h
diff --git a/demos/textedit/textedit.pro b/examples/richtext/textedit/textedit.pro
index b37ac3036aa..b37ac3036aa 100644
--- a/demos/textedit/textedit.pro
+++ b/examples/richtext/textedit/textedit.pro
diff --git a/demos/textedit/textedit.qdoc b/examples/richtext/textedit/textedit.qdoc
index 8fc96094075..8fc96094075 100644
--- a/demos/textedit/textedit.qdoc
+++ b/examples/richtext/textedit/textedit.qdoc
diff --git a/demos/textedit/textedit.qrc b/examples/richtext/textedit/textedit.qrc
index 7d6efd7d67b..7d6efd7d67b 100644
--- a/demos/textedit/textedit.qrc
+++ b/examples/richtext/textedit/textedit.qrc
diff --git a/demos/books/bookdelegate.cpp b/examples/sql/books/bookdelegate.cpp
index 566dd819288..566dd819288 100644
--- a/demos/books/bookdelegate.cpp
+++ b/examples/sql/books/bookdelegate.cpp
diff --git a/demos/books/bookdelegate.h b/examples/sql/books/bookdelegate.h
index 5dc39c02232..5dc39c02232 100644
--- a/demos/books/bookdelegate.h
+++ b/examples/sql/books/bookdelegate.h
diff --git a/demos/books/books.pro b/examples/sql/books/books.pro
index 1588288f3e8..1588288f3e8 100644
--- a/demos/books/books.pro
+++ b/examples/sql/books/books.pro
diff --git a/demos/books/books.qrc b/examples/sql/books/books.qrc
index 342638ecb04..342638ecb04 100644
--- a/demos/books/books.qrc
+++ b/examples/sql/books/books.qrc
diff --git a/demos/books/bookwindow.cpp b/examples/sql/books/bookwindow.cpp
index 40d23d17615..40d23d17615 100644
--- a/demos/books/bookwindow.cpp
+++ b/examples/sql/books/bookwindow.cpp
diff --git a/demos/books/bookwindow.h b/examples/sql/books/bookwindow.h
index 4cd609650da..4cd609650da 100644
--- a/demos/books/bookwindow.h
+++ b/examples/sql/books/bookwindow.h
diff --git a/demos/books/bookwindow.ui b/examples/sql/books/bookwindow.ui
index 659d3245648..659d3245648 100644
--- a/demos/books/bookwindow.ui
+++ b/examples/sql/books/bookwindow.ui
diff --git a/demos/books/images/star.png b/examples/sql/books/images/star.png
index 87f4464bd5e..87f4464bd5e 100644
--- a/demos/books/images/star.png
+++ b/examples/sql/books/images/star.png
diff --git a/demos/books/initdb.h b/examples/sql/books/initdb.h
index 9c9bebcba1b..9c9bebcba1b 100644
--- a/demos/books/initdb.h
+++ b/examples/sql/books/initdb.h
diff --git a/demos/books/main.cpp b/examples/sql/books/main.cpp
index 45aa8f87cfb..45aa8f87cfb 100644
--- a/demos/books/main.cpp
+++ b/examples/sql/books/main.cpp
diff --git a/demos/sqlbrowser/browser.cpp b/examples/sql/sqlbrowser/browser.cpp
index 1c537430598..1c537430598 100644
--- a/demos/sqlbrowser/browser.cpp
+++ b/examples/sql/sqlbrowser/browser.cpp
diff --git a/demos/sqlbrowser/browser.h b/examples/sql/sqlbrowser/browser.h
index 11f9e362110..11f9e362110 100644
--- a/demos/sqlbrowser/browser.h
+++ b/examples/sql/sqlbrowser/browser.h
diff --git a/demos/sqlbrowser/browserwidget.ui b/examples/sql/sqlbrowser/browserwidget.ui
index 20946f0ede3..20946f0ede3 100644
--- a/demos/sqlbrowser/browserwidget.ui
+++ b/examples/sql/sqlbrowser/browserwidget.ui
diff --git a/demos/sqlbrowser/connectionwidget.cpp b/examples/sql/sqlbrowser/connectionwidget.cpp
index 936f32f29fb..936f32f29fb 100644
--- a/demos/sqlbrowser/connectionwidget.cpp
+++ b/examples/sql/sqlbrowser/connectionwidget.cpp
diff --git a/demos/sqlbrowser/connectionwidget.h b/examples/sql/sqlbrowser/connectionwidget.h
index aa04fc25bfd..aa04fc25bfd 100644
--- a/demos/sqlbrowser/connectionwidget.h
+++ b/examples/sql/sqlbrowser/connectionwidget.h
diff --git a/demos/sqlbrowser/main.cpp b/examples/sql/sqlbrowser/main.cpp
index dc006176b70..dc006176b70 100644
--- a/demos/sqlbrowser/main.cpp
+++ b/examples/sql/sqlbrowser/main.cpp
diff --git a/demos/sqlbrowser/qsqlconnectiondialog.cpp b/examples/sql/sqlbrowser/qsqlconnectiondialog.cpp
index 56b6c031db8..56b6c031db8 100644
--- a/demos/sqlbrowser/qsqlconnectiondialog.cpp
+++ b/examples/sql/sqlbrowser/qsqlconnectiondialog.cpp
diff --git a/demos/sqlbrowser/qsqlconnectiondialog.h b/examples/sql/sqlbrowser/qsqlconnectiondialog.h
index 8c4519a1953..8c4519a1953 100644
--- a/demos/sqlbrowser/qsqlconnectiondialog.h
+++ b/examples/sql/sqlbrowser/qsqlconnectiondialog.h
diff --git a/demos/sqlbrowser/qsqlconnectiondialog.ui b/examples/sql/sqlbrowser/qsqlconnectiondialog.ui
index 91a8700579d..91a8700579d 100644
--- a/demos/sqlbrowser/qsqlconnectiondialog.ui
+++ b/examples/sql/sqlbrowser/qsqlconnectiondialog.ui
diff --git a/demos/sqlbrowser/sqlbrowser.pro b/examples/sql/sqlbrowser/sqlbrowser.pro
index dc6214622c5..dc6214622c5 100644
--- a/demos/sqlbrowser/sqlbrowser.pro
+++ b/examples/sql/sqlbrowser/sqlbrowser.pro
diff --git a/demos/undo/commands.cpp b/examples/tools/undo/commands.cpp
index e688cad6022..e688cad6022 100644
--- a/demos/undo/commands.cpp
+++ b/examples/tools/undo/commands.cpp
diff --git a/demos/undo/commands.h b/examples/tools/undo/commands.h
index ca7bd2b307d..ca7bd2b307d 100644
--- a/demos/undo/commands.h
+++ b/examples/tools/undo/commands.h
diff --git a/demos/undo/document.cpp b/examples/tools/undo/document.cpp
index e143f98061f..e143f98061f 100644
--- a/demos/undo/document.cpp
+++ b/examples/tools/undo/document.cpp
diff --git a/demos/undo/document.h b/examples/tools/undo/document.h
index b0eda92d410..b0eda92d410 100644
--- a/demos/undo/document.h
+++ b/examples/tools/undo/document.h
diff --git a/demos/undo/icons/background.png b/examples/tools/undo/icons/background.png
index 3bc5ed8cf01..3bc5ed8cf01 100644
--- a/demos/undo/icons/background.png
+++ b/examples/tools/undo/icons/background.png
diff --git a/demos/undo/icons/blue.png b/examples/tools/undo/icons/blue.png
index 4e181bb61a6..4e181bb61a6 100644
--- a/demos/undo/icons/blue.png
+++ b/examples/tools/undo/icons/blue.png
diff --git a/demos/undo/icons/circle.png b/examples/tools/undo/icons/circle.png
index ed16c6e1446..ed16c6e1446 100644
--- a/demos/undo/icons/circle.png
+++ b/examples/tools/undo/icons/circle.png
diff --git a/demos/undo/icons/exit.png b/examples/tools/undo/icons/exit.png
index 539cb2ead93..539cb2ead93 100644
--- a/demos/undo/icons/exit.png
+++ b/examples/tools/undo/icons/exit.png
diff --git a/demos/undo/icons/fileclose.png b/examples/tools/undo/icons/fileclose.png
index c5483d14ab7..c5483d14ab7 100644
--- a/demos/undo/icons/fileclose.png
+++ b/examples/tools/undo/icons/fileclose.png
diff --git a/demos/undo/icons/filenew.png b/examples/tools/undo/icons/filenew.png
index 57e57e343ba..57e57e343ba 100644
--- a/demos/undo/icons/filenew.png
+++ b/examples/tools/undo/icons/filenew.png
diff --git a/demos/undo/icons/fileopen.png b/examples/tools/undo/icons/fileopen.png
index 33e0d6394c7..33e0d6394c7 100644
--- a/demos/undo/icons/fileopen.png
+++ b/examples/tools/undo/icons/fileopen.png
diff --git a/demos/undo/icons/filesave.png b/examples/tools/undo/icons/filesave.png
index 57fd5e2f343..57fd5e2f343 100644
--- a/demos/undo/icons/filesave.png
+++ b/examples/tools/undo/icons/filesave.png
diff --git a/demos/undo/icons/green.png b/examples/tools/undo/icons/green.png
index e2e7cc9e501..e2e7cc9e501 100644
--- a/demos/undo/icons/green.png
+++ b/examples/tools/undo/icons/green.png
diff --git a/demos/undo/icons/ok.png b/examples/tools/undo/icons/ok.png
index e355ea91bc5..e355ea91bc5 100644
--- a/demos/undo/icons/ok.png
+++ b/examples/tools/undo/icons/ok.png
diff --git a/demos/undo/icons/rectangle.png b/examples/tools/undo/icons/rectangle.png
index 3a7d9795fd2..3a7d9795fd2 100644
--- a/demos/undo/icons/rectangle.png
+++ b/examples/tools/undo/icons/rectangle.png
diff --git a/demos/undo/icons/red.png b/examples/tools/undo/icons/red.png
index 58c3e7253bd..58c3e7253bd 100644
--- a/demos/undo/icons/red.png
+++ b/examples/tools/undo/icons/red.png
diff --git a/demos/undo/icons/redo.png b/examples/tools/undo/icons/redo.png
index 5591517e1ca..5591517e1ca 100644
--- a/demos/undo/icons/redo.png
+++ b/examples/tools/undo/icons/redo.png
diff --git a/demos/undo/icons/remove.png b/examples/tools/undo/icons/remove.png
index 7a7b048c0a6..7a7b048c0a6 100644
--- a/demos/undo/icons/remove.png
+++ b/examples/tools/undo/icons/remove.png
diff --git a/demos/undo/icons/triangle.png b/examples/tools/undo/icons/triangle.png
index 2969131c319..2969131c319 100644
--- a/demos/undo/icons/triangle.png
+++ b/examples/tools/undo/icons/triangle.png
diff --git a/demos/undo/icons/undo.png b/examples/tools/undo/icons/undo.png
index 8cf63a8ec95..8cf63a8ec95 100644
--- a/demos/undo/icons/undo.png
+++ b/examples/tools/undo/icons/undo.png
diff --git a/demos/undo/main.cpp b/examples/tools/undo/main.cpp
index a1bb49533a0..a1bb49533a0 100644
--- a/demos/undo/main.cpp
+++ b/examples/tools/undo/main.cpp
diff --git a/demos/undo/mainwindow.cpp b/examples/tools/undo/mainwindow.cpp
index fb166066863..fb166066863 100644
--- a/demos/undo/mainwindow.cpp
+++ b/examples/tools/undo/mainwindow.cpp
diff --git a/demos/undo/mainwindow.h b/examples/tools/undo/mainwindow.h
index 4500c6d68d3..4500c6d68d3 100644
--- a/demos/undo/mainwindow.h
+++ b/examples/tools/undo/mainwindow.h
diff --git a/demos/undo/mainwindow.ui b/examples/tools/undo/mainwindow.ui
index 91a0b437e58..91a0b437e58 100644
--- a/demos/undo/mainwindow.ui
+++ b/examples/tools/undo/mainwindow.ui
diff --git a/demos/undo/undo.pro b/examples/tools/undo/undo.pro
index 84f1d7b3260..84f1d7b3260 100644
--- a/demos/undo/undo.pro
+++ b/examples/tools/undo/undo.pro
diff --git a/demos/undo/undo.qrc b/examples/tools/undo/undo.qrc
index 65619b8f1af..65619b8f1af 100644
--- a/demos/undo/undo.qrc
+++ b/examples/tools/undo/undo.qrc