Move all other demos in qtbase to examples.

Change-Id: Iab0e7364d1f6b348d0e3033ea9304139f5bd6d0d
Reviewed-on: http://codereview.qt.nokia.com/617
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Boddie

378 files changed, 0 insertions, 137 deletions

diff --git a/demos/README b/demos/README
deleted file mode 100644
index b1619908e2..0000000000
--- 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 81968fd61d..0000000000
--- 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 c7e230e3d2..c7e230e3d2 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 429d656485..429d656485 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 4ddf59e6a0..4ddf59e6a0 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 71e3512fc3..71e3512fc3 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 9022a4ca51..9022a4ca51 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 6811a27e88..6811a27e88 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 222c3d029f..222c3d029f 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 0f30515ddf..0f30515ddf 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 f82d441068..f82d441068 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 e1220a5eb8..e1220a5eb8 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 c8e534e7e7..c8e534e7e7 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 81632a50a0..81632a50a0 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 933587a262..933587a262 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 9f581571fa..9f581571fa 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 be82dff62a..be82dff62a 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 3af5f2f29c..3af5f2f29c 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 c9fd8b0984..c9fd8b0984 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 7528f2d2da..7528f2d2da 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 aae9c9c184..aae9c9c184 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 d697c1bae8..d697c1bae8 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 88ca5144b7..88ca5144b7 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 524f5890ee..524f5890ee 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 2cca1e80fe..2cca1e80fe 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 82100a8260..82100a8260 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 df435dc47d..df435dc47d 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 4eba29e9cd..4eba29e9cd 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 f9c26873f1..f9c26873f1 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 ece9f7aaf1..ece9f7aaf1 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 0be268010e..0be268010e 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 5298821ba8..5298821ba8 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 294771a6dd..294771a6dd 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 8af11b7a66..8af11b7a66 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 0666691215..0666691215 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 1546c087a7..1546c087a7 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 b075179b46..b075179b46 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 8a0ffddbca..8a0ffddbca 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 40ed239638..40ed239638 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 48e429d2bf..48e429d2bf 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 5ad3db660a..5ad3db660a 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 114ccc310e..114ccc310e 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 3af5f2f29c..3af5f2f29c 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 0c0c350600..0c0c350600 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 06d0e47a5c..06d0e47a5c 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 f9c26873f1..f9c26873f1 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 67dd76dac0..67dd76dac0 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 17668b07de..17668b07de 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 cf6c04560b..cf6c04560b 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 219233ce6b..219233ce6b 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 8dd0a2eb86..8dd0a2eb86 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 86e588d4d8..86e588d4d8 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 7b6a36e93a..7b6a36e93a 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 b2e3526bea..b2e3526bea 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 b11a77886e..b11a77886e 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 24eede887a..24eede887a 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 be75bd1995..be75bd1995 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 0a94aab7eb..0a94aab7eb 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 426dedfbd4..426dedfbd4 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 bcf708c512..bcf708c512 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 593c8dfe8d..593c8dfe8d 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 aace3b502b..aace3b502b 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 462e13b90e..462e13b90e 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 cda9603196..cda9603196 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 5575f5e65f..5575f5e65f 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 80a3af11cc..80a3af11cc 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 2c8a5a2884..2c8a5a2884 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 0d6087dc26..0d6087dc26 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 f0b370d878..f0b370d878 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 e2653361a1..e2653361a1 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 4b5f71969f..4b5f71969f 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 8c9bacfa38..8c9bacfa38 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 a5ec24dabf..a5ec24dabf 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 895524355e..895524355e 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 7fa06fa90a..7fa06fa90a 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 e9a448b1e3..e9a448b1e3 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 edcc1a7396..edcc1a7396 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 3195d3297c..3195d3297c 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 6ee744bc63..6ee744bc63 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 3711a6dc57..3711a6dc57 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 2312bcc9f0..2312bcc9f0 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 58e71c8376..58e71c8376 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 a33423f543..a33423f543 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 babea7e0cb..babea7e0cb 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 3a24c758a6..3a24c758a6 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 d672530e19..d672530e19 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 45b5c188a2..45b5c188a2 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 2751c3a647..2751c3a647 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 85f74e638e..85f74e638e 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 d01457e3f4..d01457e3f4 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 ac70a23316..ac70a23316 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 8c71f2946a..8c71f2946a 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 64ba5c3e59..64ba5c3e59 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 d404044a9a..d404044a9a 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 a4bb1826b9..a4bb1826b9 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 974a06093c..974a06093c 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 2eb1ba7ff6..2eb1ba7ff6 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 fc5c16d4c8..fc5c16d4c8 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 432fe6bc76..432fe6bc76 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 ac8671b5e4..ac8671b5e4 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 b0d4a0fa6f..b0d4a0fa6f 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 3a04edb96a..3a04edb96a 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 e69de29bb2..e69de29bb2 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 a0ab1fa21a..a0ab1fa21a 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 b38eb366f4..b38eb366f4 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 7a484b0365..7a484b0365 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 60700dd1df..60700dd1df 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 96237d4203..96237d4203 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 7bac8a84d7..7bac8a84d7 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 11fa5348de..11fa5348de 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 767f44aead..767f44aead 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 98eb87a33b..98eb87a33b 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 b8a4a99ae4..b8a4a99ae4 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 faf3601606..faf3601606 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 31acc4224a..31acc4224a 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 d599a3a0ac..d599a3a0ac 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 d27506dc5a..d27506dc5a 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 07c282eab9..07c282eab9 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 46cd2f9cf3..46cd2f9cf3 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 40c01ddff3..40c01ddff3 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 0b42e8a1b1..0b42e8a1b1 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 2aca9b1e98..2aca9b1e98 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 2e49173848..2e49173848 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 a9f1bcbefb..a9f1bcbefb 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 462f9674f4..462f9674f4 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 aeac2c2fed..aeac2c2fed 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 e12132b4cd..e12132b4cd 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 6b18d3f128..6b18d3f128 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 b712efe38b..b712efe38b 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 54de548cd7..54de548cd7 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 ecf6531d85..ecf6531d85 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 abaeeb97bc..abaeeb97bc 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 483170801f..483170801f 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 170ec3abef..170ec3abef 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 50e20739b9..50e20739b9 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 4014b4659c..4014b4659c 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 7d3e97eb36..7d3e97eb36 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 d24116578c..d24116578c 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 56b86a55bb..56b86a55bb 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 576c522bbb..576c522bbb 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 10ab38a54c..10ab38a54c 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 5058043707..5058043707 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 54dda82000..54dda82000 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 39cd0fcafd..39cd0fcafd 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 96ee908d58..96ee908d58 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 41cfda6b23..41cfda6b23 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 03f53bd530..03f53bd530 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 1bb864ce90..1bb864ce90 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 097851a42c..097851a42c 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 19950b252c..19950b252c 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 21b63bae2c..21b63bae2c 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 ff9f636843..ff9f636843 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 1e1a7de735..1e1a7de735 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 ba7c02dc18..ba7c02dc18 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 c7cdf0c4c0..c7cdf0c4c0 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 e983e4cca6..e983e4cca6 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 7476c00ab1..7476c00ab1 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 650e1f1f3c..650e1f1f3c 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 157e86ed64..157e86ed64 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 8cfa931986..8cfa931986 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 ec5e8664a1..ec5e8664a1 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 5634f85d98..5634f85d98 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 7c587d4147..7c587d4147 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 8b0daeea48..8b0daeea48 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 1575dd24f6..1575dd24f6 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 445567fbda..445567fbda 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 cbc622a34f..cbc622a34f 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 1ceaa06bb3..1ceaa06bb3 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 f932307925..f932307925 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 b7f8da085e..b7f8da085e 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 f967b10085..f967b10085 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 675a9889a2..675a9889a2 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 33be5038da..33be5038da 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 bca81b8c79..bca81b8c79 100644
--- a/demos/embeddeddialogs/main.cpp
+++ b/examples/graphicsview/embeddeddialogs/main.cpp
diff --git a/demos/interview/README b/examples/itemviews/interview/README
index 50894428f6..50894428f6 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 589fd2df59..589fd2df59 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 0c3d690258..0c3d690258 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 6b2ad969d4..6b2ad969d4 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 a497fbc407..a497fbc407 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 b28ea34d8a..b28ea34d8a 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 b9656c6185..b9656c6185 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 6031615711..6031615711 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 f0ae556ce3..f0ae556ce3 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 0c3d690258..0c3d690258 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 4c20646f9c..4c20646f9c 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 0962e28844..0962e28844 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 7c74844483..7c74844483 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 6b99521b7b..6b99521b7b 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 386a469c99..386a469c99 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 7179d98eba..7179d98eba 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 13f496d8e3..13f496d8e3 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 6f2f2dd071..6f2f2dd071 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 7987f35499..7987f35499 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 74a1967a8a..74a1967a8a 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 b0e7e337ed..b0e7e337ed 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 10ff3b5147..10ff3b5147 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 3b0ba6f02a..3b0ba6f02a 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 435905612a..435905612a 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 34e4847068..34e4847068 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 dd16fddbe7..dd16fddbe7 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 555f1c6cd4..555f1c6cd4 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 71cff13cb8..71cff13cb8 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 a58a713c0b..a58a713c0b 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 aa01ffa131..aa01ffa131 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 6da113d722..6da113d722 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 47ff22a3e4..47ff22a3e4 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 48fa9fc2ef..48fa9fc2ef 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 5cc141355c..5cc141355c 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 315166202b..315166202b 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 a4505268ec..a4505268ec 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 1176ee5480..1176ee5480 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 5b982ee73b..5b982ee73b 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 b3f810b26c..b3f810b26c 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 86e8f5c0df..86e8f5c0df 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 1848ad8bd1..1848ad8bd1 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 59b91126b9..59b91126b9 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 d02c397ee8..d02c397ee8 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 f8e022c98c..f8e022c98c 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 6a3c2a02ef..6a3c2a02ef 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 d6bc170a97..d6bc170a97 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 3393b8e83c..3393b8e83c 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 2e59ebcfc5..2e59ebcfc5 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 c49117a2f2..c49117a2f2 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 f80ef2b8be..f80ef2b8be 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 73a1955082..73a1955082 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 b3f63a8e0a..b3f63a8e0a 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 d8b739b3b0..d8b739b3b0 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 e1a2bcb41e..e1a2bcb41e 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 1ea2c0ed6c..1ea2c0ed6c 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 ed4120e01c..ed4120e01c 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 fb971eb17b..fb971eb17b 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 1d2f0d5775..1d2f0d5775 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 b357f99336..b357f99336 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 02c35f7721..02c35f7721 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 f0360b6648..f0360b6648 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 9e7e50de76..9e7e50de76 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 9bbf8a6f77..9bbf8a6f77 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 a9a723409e..a9a723409e 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 432b8b34e5..432b8b34e5 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 32c7fad970..32c7fad970 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 b3c75f0fc4..b3c75f0fc4 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 dc8f92505d..dc8f92505d 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 36c24186d3..36c24186d3 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 aff5d2ac75..aff5d2ac75 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 ee670266f0..ee670266f0 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 db31dd971d..db31dd971d 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 38ead1c719..38ead1c719 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 87abe67ac9..87abe67ac9 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 66bfc13cb4..66bfc13cb4 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 3d4cfe25b1..3d4cfe25b1 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 4dd4ad11e6..4dd4ad11e6 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 034b474d02..034b474d02 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 889b40d304..889b40d304 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 0b3023f397..0b3023f397 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 0021e35864..0021e35864 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 40f331c293..40f331c293 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 023af8c700..023af8c700 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 001f3a7144..001f3a7144 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 58c68d407a..58c68d407a 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 6a7e8d3eb3..6a7e8d3eb3 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 af2fe061e3..af2fe061e3 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 fdf2e97b13..fdf2e97b13 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 f47b67d7c0..f47b67d7c0 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 c122f462ed..c122f462ed 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 1056b7812a..1056b7812a 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 5746ef96fc..5746ef96fc 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 98d9cd96b4..98d9cd96b4 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 1a0a328c20..1a0a328c20 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 1c61442d9f..1c61442d9f 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 0d9bb972f9..0d9bb972f9 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 d5bc7ea5fe..d5bc7ea5fe 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 a2f9a35925..a2f9a35925 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 60ef3f9485..60ef3f9485 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 af1753a3e7..af1753a3e7 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 f875838bb5..f875838bb5 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 400906ebfa..400906ebfa 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 50a049ec56..50a049ec56 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 1b3d62c007..1b3d62c007 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 d7f141daef..d7f141daef 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 8e1f510813..8e1f510813 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 2d475070c8..2d475070c8 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 dc3ff8536c..dc3ff8536c 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 11043345d0..11043345d0 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 fb7b04c0be..fb7b04c0be 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 88d7fbedab..88d7fbedab 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 17336ecf80..17336ecf80 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 6327b5f8fc..6327b5f8fc 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 5f91e9873b..5f91e9873b 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 f551364464..f551364464 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 a784fd5709..a784fd5709 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 64c0b2d6ab..64c0b2d6ab 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 8875bf246c..8875bf246c 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 a3bd5e0bf2..a3bd5e0bf2 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 ebb44e6b88..ebb44e6b88 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 d3882c7b3f..d3882c7b3f 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 fc06c5ec63..fc06c5ec63 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 10ca56c82a..10ca56c82a 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 b41ecf5319..b41ecf5319 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 38400bd1f6..38400bd1f6 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 2ef5b2ee6f..2ef5b2ee6f 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 0170ee26a6..0170ee26a6 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 39cd6c1a9d..39cd6c1a9d 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 83a66d5535..83a66d5535 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 e7c04645cf..e7c04645cf 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 968bac5e90..968bac5e90 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 d46f5aff0d..d46f5aff0d 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 46326566d1..46326566d1 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 1121b47d8b..1121b47d8b 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 38e55f7420..38e55f7420 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 ffab15aaf8..ffab15aaf8 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 9d679fe6fc..9d679fe6fc 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 eee23d24a3..eee23d24a3 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 eef5132928..eef5132928 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 af5d122141..af5d122141 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 fc6f17e977..fc6f17e977 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 ba7c02dc18..ba7c02dc18 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 8feec99bee..8feec99bee 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 9cbc7138b9..9cbc7138b9 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 11efb4b852..11efb4b852 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 b30ce14c14..b30ce14c14 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 9de0c88085..9de0c88085 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 16f80bc325..16f80bc325 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 16872df62a..16872df62a 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 c72eff53fb..c72eff53fb 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 2e586fc7bf..2e586fc7bf 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 a736d39343..a736d39343 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 036fa80ba7..036fa80ba7 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 c8373262c9..c8373262c9 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 6436178ab5..6436178ab5 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 b37ac3036a..b37ac3036a 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 8fc9609407..8fc9609407 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 7d6efd7d67..7d6efd7d67 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 566dd81928..566dd81928 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 5dc39c0223..5dc39c0223 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 1588288f3e..1588288f3e 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 342638ecb0..342638ecb0 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 40d23d1761..40d23d1761 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 4cd609650d..4cd609650d 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 659d324564..659d324564 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 87f4464bd5..87f4464bd5 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 9c9bebcba1..9c9bebcba1 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 45aa8f87cf..45aa8f87cf 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 1c53743059..1c53743059 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 11f9e36211..11f9e36211 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 20946f0ede..20946f0ede 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 936f32f29f..936f32f29f 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 aa04fc25bf..aa04fc25bf 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 dc006176b7..dc006176b7 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 56b6c031db..56b6c031db 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 8c4519a195..8c4519a195 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 91a8700579..91a8700579 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 dc6214622c..dc6214622c 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 e688cad602..e688cad602 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 ca7bd2b307..ca7bd2b307 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 e143f98061..e143f98061 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 b0eda92d41..b0eda92d41 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 3bc5ed8cf0..3bc5ed8cf0 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 4e181bb61a..4e181bb61a 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 ed16c6e144..ed16c6e144 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 539cb2ead9..539cb2ead9 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 c5483d14ab..c5483d14ab 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 57e57e343b..57e57e343b 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 33e0d6394c..33e0d6394c 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 57fd5e2f34..57fd5e2f34 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 e2e7cc9e50..e2e7cc9e50 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 e355ea91bc..e355ea91bc 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 3a7d9795fd..3a7d9795fd 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 58c3e7253b..58c3e7253b 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 5591517e1c..5591517e1c 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 7a7b048c0a..7a7b048c0a 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 2969131c31..2969131c31 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 8cf63a8ec9..8cf63a8ec9 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 a1bb49533a..a1bb49533a 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 fb16606686..fb16606686 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 4500c6d68d..4500c6d68d 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 91a0b437e5..91a0b437e5 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 84f1d7b326..84f1d7b326 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 65619b8f1a..65619b8f1a 100644
--- a/demos/undo/undo.qrc
+++ b/examples/tools/undo/undo.qrc