Fix use of qmlapplicationviewer.

- Two separate copies for demos and example
- Fix deployment (don't install to opt in desktop case)

Reviewed-by: Casper van Donderen

67 files changed, 282 insertions, 64 deletions

diff --git a/examples/declarative/animation/basics/color-animation/coloranimation.pro b/examples/declarative/animation/basics/color-animation/coloranimation.pro
index a6ce3f69dd..0a3419044d 100644
--- a/examples/declarative/animation/basics/color-animation/coloranimation.pro
+++ b/examples/declarative/animation/basics/color-animation/coloranimation.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xE959F610
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/basics/color-animation
+include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/animation/basics/property-animation/propertyanimation.pro b/examples/declarative/animation/basics/property-animation/propertyanimation.pro
index e4e947154b..f79f1cbe6f 100644
--- a/examples/declarative/animation/basics/property-animation/propertyanimation.pro
+++ b/examples/declarative/animation/basics/property-animation/propertyanimation.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xE4032BC6
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/basics/property-animation
+include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/animation/behaviors/behavior-example/behaviorexample.pro b/examples/declarative/animation/behaviors/behavior-example/behaviorexample.pro
index f1dc1aa391..91b021f60d 100644
--- a/examples/declarative/animation/behaviors/behavior-example/behaviorexample.pro
+++ b/examples/declarative/animation/behaviors/behavior-example/behaviorexample.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xEB6022A4
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/behaviors/behavior-example
+include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/animation/easing/easing.pro b/examples/declarative/animation/easing/easing.pro
index 1f003b1ead..b3d1821c64 100644
--- a/examples/declarative/animation/easing/easing.pro
+++ b/examples/declarative/animation/easing/easing.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xEAA54148
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/easing
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/animation/states/states.pro b/examples/declarative/animation/states/states.pro
index 8239977f44..1f06e4b492 100644
--- a/examples/declarative/animation/states/states.pro
+++ b/examples/declarative/animation/states/states.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xE9200E0A
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/states
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro b/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
index 66ce4b11bc..5cc36605d8 100644
--- a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
+++ b/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
@@ -35,5 +35,6 @@ SOURCES += main.cpp
 RESOURCES += networkaccessmanagerfactory.qrc
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/networkaccessmanagerfactory
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro
index 9dbca8f231..0822a1df8a 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro
@@ -42,6 +42,7 @@ RESOURCES += \
     gridlayout.qrc
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout
+include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
 
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro
index ca4232c591..f8a4c978e9 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro
@@ -41,5 +41,6 @@ RESOURCES += \
     linearlayout.qrc
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout
+include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/i18n/i18n.pro b/examples/declarative/i18n/i18n.pro
index d7cb3a8721..af9b65c58e 100644
--- a/examples/declarative/i18n/i18n.pro
+++ b/examples/declarative/i18n/i18n.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xE069582C
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/i18n
+include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/imageelements/borderimage/borderimage.pro b/examples/declarative/imageelements/borderimage/borderimage.pro
index 64eaf4a1ef..20528cc64c 100644
--- a/examples/declarative/imageelements/borderimage/borderimage.pro
+++ b/examples/declarative/imageelements/borderimage/borderimage.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xEBB4D123
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/imageelements/borderimage
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/imageelements/image/image.pro b/examples/declarative/imageelements/image/image.pro
index 28c978cfc1..5e7b905110 100644
--- a/examples/declarative/imageelements/image/image.pro
+++ b/examples/declarative/imageelements/image/image.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xE5D64785
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/imageelements/image
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/imageelements/shadows/shadows.pro b/examples/declarative/imageelements/shadows/shadows.pro
index 20d8a3d528..a760dd83bc 100644
--- a/examples/declarative/imageelements/shadows/shadows.pro
+++ b/examples/declarative/imageelements/shadows/shadows.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xE2C00C58
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/imageelements/shadows
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/keyinteraction/focus/focus.pro b/examples/declarative/keyinteraction/focus/focus.pro
index e51cd0f9e7..4129206539 100644
--- a/examples/declarative/keyinteraction/focus/focus.pro
+++ b/examples/declarative/keyinteraction/focus/focus.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xEC9F742D
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/keyinteraction/focus
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/Delegate/Delegate.pro b/examples/declarative/modelviews/Delegate/Delegate.pro
index 86901d388a..785d4a7a69 100644
--- a/examples/declarative/modelviews/Delegate/Delegate.pro
+++ b/examples/declarative/modelviews/Delegate/Delegate.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xE5FF52C0
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/Delegate
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro
index 98490b2e58..18fef97f3a 100644
--- a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro
+++ b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro
@@ -35,5 +35,6 @@ HEADERS = model.h
 RESOURCES += abstractitemmodel.qrc
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/abstractitemmodel
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/gridview-example/gridviewexample.pro b/examples/declarative/modelviews/gridview-example/gridviewexample.pro
index 15a7d53cd5..a768342584 100644
--- a/examples/declarative/modelviews/gridview-example/gridviewexample.pro
+++ b/examples/declarative/modelviews/gridview-example/gridviewexample.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xE53E8FDC
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/gridview-example
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro b/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro
index 9d8a3fe826..0c1dfd5f9f 100644
--- a/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro
+++ b/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xE49D962F
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/listview/dynamiclist
+include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro b/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro
index e9bbc65e64..38394f9146 100644
--- a/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro
+++ b/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xEEA16F93
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/listview/expandingdelegates
+include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/listview/highlight/highlight.pro b/examples/declarative/modelviews/listview/highlight/highlight.pro
index a0a5c01c24..944cc6a887 100644
--- a/examples/declarative/modelviews/listview/highlight/highlight.pro
+++ b/examples/declarative/modelviews/listview/highlight/highlight.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xE9439941
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/listview/highlight
+include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro b/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro
index f86e6c74a5..637b463a75 100644
--- a/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro
+++ b/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xE7A0AE23
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/listview/highlightranges
+include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/listview/sections/sections.pro b/examples/declarative/modelviews/listview/sections/sections.pro
index 0d9151b9b5..e78143ff1c 100644
--- a/examples/declarative/modelviews/listview/sections/sections.pro
+++ b/examples/declarative/modelviews/listview/sections/sections.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xEA0874F7
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/listview/sections
+include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro
index 08ac23149f..76ebf4fff0 100644
--- a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro
+++ b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro
@@ -36,5 +36,6 @@ HEADERS += dataobject.h
 RESOURCES += objectlistmodel.qrc
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/objectlistmodel
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/package/Delegate.pro b/examples/declarative/modelviews/package/Delegate.pro
index d1b7c82d61..83264576a7 100644
--- a/examples/declarative/modelviews/package/Delegate.pro
+++ b/examples/declarative/modelviews/package/Delegate.pro
@@ -33,5 +33,6 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/package
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/parallax/parallax.pro b/examples/declarative/modelviews/parallax/parallax.pro
index 42272b6563..f01fdda190 100644
--- a/examples/declarative/modelviews/parallax/parallax.pro
+++ b/examples/declarative/modelviews/parallax/parallax.pro
@@ -33,5 +33,6 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/parallax
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/pathview-example/pathviewexample.pro b/examples/declarative/modelviews/pathview-example/pathviewexample.pro
index 9b1d360835..ec56848365 100644
--- a/examples/declarative/modelviews/pathview-example/pathviewexample.pro
+++ b/examples/declarative/modelviews/pathview-example/pathviewexample.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xE51EA833
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/pathview-example
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro b/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro
index 463e870500..5642b8ee2e 100644
--- a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro
+++ b/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro
@@ -33,5 +33,6 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/stringlistmodel
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro
index 8a75ca0d9b..88d7f1b737 100644
--- a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro
+++ b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xE722A922
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/visualitemmodel
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/webview/alerts/alerts.pro b/examples/declarative/modelviews/webview/alerts/alerts.pro
index 1de38585a0..31a9b6c107 100644
--- a/examples/declarative/modelviews/webview/alerts/alerts.pro
+++ b/examples/declarative/modelviews/webview/alerts/alerts.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xE14997C0
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/webview/alerts
+include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/webview/autosize/autosize.pro b/examples/declarative/modelviews/webview/autosize/autosize.pro
index 13913c618a..595ab2e68f 100644
--- a/examples/declarative/modelviews/webview/autosize/autosize.pro
+++ b/examples/declarative/modelviews/webview/autosize/autosize.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xEE6AB317
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/webview/autosize
+include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/webview/googlemaps/googlemaps.pro b/examples/declarative/modelviews/webview/googlemaps/googlemaps.pro
index 2bbfbf5250..6b03c2d9f4 100644
--- a/examples/declarative/modelviews/webview/googlemaps/googlemaps.pro
+++ b/examples/declarative/modelviews/webview/googlemaps/googlemaps.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xEF02570C
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/webview/googlemaps
+include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/webview/inlinehtml/inlinehtml.pro b/examples/declarative/modelviews/webview/inlinehtml/inlinehtml.pro
index 7accabe97f..d779351a9c 100644
--- a/examples/declarative/modelviews/webview/inlinehtml/inlinehtml.pro
+++ b/examples/declarative/modelviews/webview/inlinehtml/inlinehtml.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xEF18EEF4
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/webview/inlinehtml
+include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/webview/newwindows/newwindows.pro b/examples/declarative/modelviews/webview/newwindows/newwindows.pro
index d1535617eb..52324dd7ab 100644
--- a/examples/declarative/modelviews/webview/newwindows/newwindows.pro
+++ b/examples/declarative/modelviews/webview/newwindows/newwindows.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xEE16E439
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/webview/newwindows
+include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/positioners/positioners.pro b/examples/declarative/positioners/positioners.pro
index 3bf888f027..9aa469377c 100644
--- a/examples/declarative/positioners/positioners.pro
+++ b/examples/declarative/positioners/positioners.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xE6D726D3
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/positioners
+include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/righttoleft/layoutdirection/layoutdirection.pro b/examples/declarative/righttoleft/layoutdirection/layoutdirection.pro
index a7f11d8bc0..ba634f535b 100644
--- a/examples/declarative/righttoleft/layoutdirection/layoutdirection.pro
+++ b/examples/declarative/righttoleft/layoutdirection/layoutdirection.pro
@@ -33,5 +33,6 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/righttoleft/layoutdirection
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.pro b/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.pro
index ab52726d9a..55b46fd06b 100644
--- a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.pro
+++ b/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.pro
@@ -33,5 +33,6 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/righttoleft/layoutmirroring
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/righttoleft/textalignment/textalignment.pro b/examples/declarative/righttoleft/textalignment/textalignment.pro
index 2db41eca8a..366f793141 100644
--- a/examples/declarative/righttoleft/textalignment/textalignment.pro
+++ b/examples/declarative/righttoleft/textalignment/textalignment.pro
@@ -33,5 +33,6 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/righttoleft/textalignment
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/shadereffects/shadereffects.pro b/examples/declarative/shadereffects/shadereffects.pro
index 23a951c2f7..13f345c3b8 100755
--- a/examples/declarative/shadereffects/shadereffects.pro
+++ b/examples/declarative/shadereffects/shadereffects.pro
@@ -39,5 +39,6 @@ symbian {
 }
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/shadereffects
+include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/sqllocalstorage/sqllocalstorage.pro b/examples/declarative/sqllocalstorage/sqllocalstorage.pro
index de4a4e0955..9a88b49c2a 100644
--- a/examples/declarative/sqllocalstorage/sqllocalstorage.pro
+++ b/examples/declarative/sqllocalstorage/sqllocalstorage.pro
@@ -34,5 +34,6 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/sqllocalstorage
+include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/text/fonts/availableFonts/availableFonts.pro b/examples/declarative/text/fonts/availableFonts/availableFonts.pro
index 38548af167..50fbfc4cd5 100644
--- a/examples/declarative/text/fonts/availableFonts/availableFonts.pro
+++ b/examples/declarative/text/fonts/availableFonts/availableFonts.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xE696D9F7
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/text/fonts/availableFonts
+include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/text/fonts/banner/banner.pro b/examples/declarative/text/fonts/banner/banner.pro
index 71e4ab9f6d..aaada0d15e 100644
--- a/examples/declarative/text/fonts/banner/banner.pro
+++ b/examples/declarative/text/fonts/banner/banner.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xEBAA8CBE
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/text/fonts/banner
+include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/text/fonts/fonts/fonts.pro b/examples/declarative/text/fonts/fonts/fonts.pro
index 5d7c6914fc..67e1646cc1 100644
--- a/examples/declarative/text/fonts/fonts/fonts.pro
+++ b/examples/declarative/text/fonts/fonts/fonts.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xE4CA52B6
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/text/fonts/fonts
+include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/text/fonts/hello/hello.pro b/examples/declarative/text/fonts/hello/hello.pro
index 8ba73befa4..194dcd8d74 100644
--- a/examples/declarative/text/fonts/hello/hello.pro
+++ b/examples/declarative/text/fonts/hello/hello.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xE4A6D856
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/text/fonts/hello
+include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/text/textselection/textselection.pro b/examples/declarative/text/textselection/textselection.pro
index 205bd18a65..fbf4a95aff 100644
--- a/examples/declarative/text/textselection/textselection.pro
+++ b/examples/declarative/text/textselection/textselection.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xEFBED80D
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/text/textselection
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/threading/threadedlistmodel/threadedlistmodel.pro b/examples/declarative/threading/threadedlistmodel/threadedlistmodel.pro
index d81bf627ad..7545a065bb 100644
--- a/examples/declarative/threading/threadedlistmodel/threadedlistmodel.pro
+++ b/examples/declarative/threading/threadedlistmodel/threadedlistmodel.pro
@@ -33,5 +33,6 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/threading/threadedlistmodel
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/threading/workerscript/workerscript.pro b/examples/declarative/threading/workerscript/workerscript.pro
index fa60c1b15a..ce1c67e6e1 100644
--- a/examples/declarative/threading/workerscript/workerscript.pro
+++ b/examples/declarative/threading/workerscript/workerscript.pro
@@ -33,5 +33,6 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/threading/workerscript
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/touchinteraction/gestures/experimental-gestures/experimentalgestures.pro b/examples/declarative/touchinteraction/gestures/experimental-gestures/experimentalgestures.pro
index 729eaec4bb..00de964e6e 100644
--- a/examples/declarative/touchinteraction/gestures/experimental-gestures/experimentalgestures.pro
+++ b/examples/declarative/touchinteraction/gestures/experimental-gestures/experimentalgestures.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xE3FF6816
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/touchinteraction/gestures/experimental-gestures
+include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/touchinteraction/mousearea/mousearea-example/mouseareaexample.pro b/examples/declarative/touchinteraction/mousearea/mousearea-example/mouseareaexample.pro
index 0311371673..7bf1883ddf 100644
--- a/examples/declarative/touchinteraction/mousearea/mousearea-example/mouseareaexample.pro
+++ b/examples/declarative/touchinteraction/mousearea/mousearea-example/mouseareaexample.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xECA7EEBE
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/touchinteraction/mousearea/mousearea-example
+include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/touchinteraction/pincharea/pincharea.pro b/examples/declarative/touchinteraction/pincharea/pincharea.pro
index dc2e4c6fb6..5c515f7f12 100644
--- a/examples/declarative/touchinteraction/pincharea/pincharea.pro
+++ b/examples/declarative/touchinteraction/pincharea/pincharea.pro
@@ -33,5 +33,6 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/touchinteraction/pincharea
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/toys/clocks/clocks.pro b/examples/declarative/toys/clocks/clocks.pro
index db03bfbe65..6c9639bdc5 100644
--- a/examples/declarative/toys/clocks/clocks.pro
+++ b/examples/declarative/toys/clocks/clocks.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xE96223F9
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/toys/clocks
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/toys/corkboards/corkboards.pro b/examples/declarative/toys/corkboards/corkboards.pro
index 5ad2e5b4bc..caf1fb9c70 100644
--- a/examples/declarative/toys/corkboards/corkboards.pro
+++ b/examples/declarative/toys/corkboards/corkboards.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xEAF97D84
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/toys/corkboards
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/toys/dynamicscene/dynamicscene.pro b/examples/declarative/toys/dynamicscene/dynamicscene.pro
index 60b4daf17e..49b8716945 100644
--- a/examples/declarative/toys/dynamicscene/dynamicscene.pro
+++ b/examples/declarative/toys/dynamicscene/dynamicscene.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xEE509F2D
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/toys/dynamicscene
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/toys/tic-tac-toe/tictactoe.pro b/examples/declarative/toys/tic-tac-toe/tictactoe.pro
index deb9ba31b8..70cc85892f 100644
--- a/examples/declarative/toys/tic-tac-toe/tictactoe.pro
+++ b/examples/declarative/toys/tic-tac-toe/tictactoe.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xEFDDF868
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/toys/tic-tac-toe
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/toys/tvtennis/tvtennis.pro b/examples/declarative/toys/tvtennis/tvtennis.pro
index 3ae795e414..d09f1c6ef9 100644
--- a/examples/declarative/toys/tvtennis/tvtennis.pro
+++ b/examples/declarative/toys/tvtennis/tvtennis.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xE6511DAE
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/toys/tvtennis
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/ui-components/dialcontrol/dialcontrol.pro b/examples/declarative/ui-components/dialcontrol/dialcontrol.pro
index fb784f7bd1..0d43b16929 100644
--- a/examples/declarative/ui-components/dialcontrol/dialcontrol.pro
+++ b/examples/declarative/ui-components/dialcontrol/dialcontrol.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xEB1C54E8
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/ui-components/dialcontrol
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/ui-components/flipable/flipable.pro b/examples/declarative/ui-components/flipable/flipable.pro
index f1ee5aec85..f35d336db3 100644
--- a/examples/declarative/ui-components/flipable/flipable.pro
+++ b/examples/declarative/ui-components/flipable/flipable.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xE31D80B6
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/ui-components/flipable
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/ui-components/main/main.pro b/examples/declarative/ui-components/main/main.pro
index 60b0ed500e..c362497f14 100644
--- a/examples/declarative/ui-components/main/main.pro
+++ b/examples/declarative/ui-components/main/main.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xE647B679
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/ui-components/main
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/ui-components/progressbar/progressbar.pro b/examples/declarative/ui-components/progressbar/progressbar.pro
index 38eef3c46d..84307bdca8 100644
--- a/examples/declarative/ui-components/progressbar/progressbar.pro
+++ b/examples/declarative/ui-components/progressbar/progressbar.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xEAA2206D
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/ui-components/progressbar
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/ui-components/scrollbar/scrollbar.pro b/examples/declarative/ui-components/scrollbar/scrollbar.pro
index b0cdaca91e..ddede4ad81 100644
--- a/examples/declarative/ui-components/scrollbar/scrollbar.pro
+++ b/examples/declarative/ui-components/scrollbar/scrollbar.pro
@@ -33,5 +33,6 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/ui-components/scrollbar
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/ui-components/searchbox/searchbox.pro b/examples/declarative/ui-components/searchbox/searchbox.pro
index f64718a4fb..028998a6f3 100644
--- a/examples/declarative/ui-components/searchbox/searchbox.pro
+++ b/examples/declarative/ui-components/searchbox/searchbox.pro
@@ -33,5 +33,6 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/ui-components/searchbox
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/ui-components/slideswitch/slideswitch.pro b/examples/declarative/ui-components/slideswitch/slideswitch.pro
index c4dbec10dc..ed782170d7 100644
--- a/examples/declarative/ui-components/slideswitch/slideswitch.pro
+++ b/examples/declarative/ui-components/slideswitch/slideswitch.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xEAB2005A
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/ui-components/slideswitch
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/ui-components/spinner/spinner.pro b/examples/declarative/ui-components/spinner/spinner.pro
index ffb0f764d1..fb08dd8eaf 100644
--- a/examples/declarative/ui-components/spinner/spinner.pro
+++ b/examples/declarative/ui-components/spinner/spinner.pro
@@ -33,5 +33,6 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/ui-components/spinner
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/ui-components/tabwidget/tabwidget.pro b/examples/declarative/ui-components/tabwidget/tabwidget.pro
index 04d1027e7c..11db318c35 100644
--- a/examples/declarative/ui-components/tabwidget/tabwidget.pro
+++ b/examples/declarative/ui-components/tabwidget/tabwidget.pro
@@ -33,5 +33,6 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/ui-components/tabwidget
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.pro b/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.pro
index c953e33afe..01c0bdac91 100644
--- a/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.pro
+++ b/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.pro
@@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xE83495FC
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/xml/xmlhttprequest-example
+include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/tools/qmlapplicationviewer/qmlapplicationviewer.cpp b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp
index 1bba248d97..1bba248d97 100644
--- a/examples/tools/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp
diff --git a/examples/tools/qmlapplicationviewer/qmlapplicationviewer.h b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.h
index d6cb43e10e..d6cb43e10e 100644
--- a/examples/tools/qmlapplicationviewer/qmlapplicationviewer.h
+++ b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.h
diff --git a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri
new file mode 100644
index 0000000000..de03b4c320
--- /dev/null
+++ b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri
@@ -0,0 +1,152 @@
+# This file was generated by the Qt Quick Application wizard of Qt Creator.
+# The code below adds the QmlApplicationViewer to the project and handles the
+# activation of QML debugging.
+# It is recommended not to modify this file, since newer versions of Qt Creator
+# may offer an updated version of it.
+
+QT += declarative
+
+SOURCES += $$PWD/qmlapplicationviewer.cpp
+HEADERS += $$PWD/qmlapplicationviewer.h
+INCLUDEPATH += $$PWD
+
+# Include JS debugger library if QMLJSDEBUGGER_PATH is set
+!isEmpty(QMLJSDEBUGGER_PATH) {
+    include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
+} else {
+    DEFINES -= QMLJSDEBUGGER
+}
+
+contains(CONFIG,qdeclarative-boostable):contains(MEEGO_EDITION,harmattan) {
+    DEFINES += HARMATTAN_BOOSTER
+}
+# This file was generated by an application wizard of Qt Creator.
+# The code below handles deployment to Symbian and Maemo, aswell as copying
+# of the application data to shadow build directories on desktop.
+# It is recommended not to modify this file, since newer versions of Qt Creator
+# may offer an updated version of it.
+
+defineTest(qtcAddDeployment) {
+for(deploymentfolder, DEPLOYMENTFOLDERS) {
+    item = item$${deploymentfolder}
+    itemsources = $${item}.sources
+    $$itemsources = $$eval($${deploymentfolder}.source)
+    itempath = $${item}.path
+    $$itempath= $$eval($${deploymentfolder}.target)
+    export($$itemsources)
+    export($$itempath)
+    DEPLOYMENT += $$item
+}
+
+MAINPROFILEPWD = $$_PRO_FILE_PWD_
+
+symbian {
+    isEmpty(ICON):exists($${TARGET}.svg):ICON = $${TARGET}.svg
+    isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
+} else:win32 {
+    copyCommand =
+    for(deploymentfolder, DEPLOYMENTFOLDERS) {
+        source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
+        source = $$replace(source, /, \\)
+        sourcePathSegments = $$split(source, \\)
+        target = $$OUT_PWD/$$eval($${deploymentfolder}.target)/$$last(sourcePathSegments)
+        target = $$replace(target, /, \\)
+        target ~= s,\\\\\\.?\\\\,\\,
+        !isEqual(source,$$target) {
+            !isEmpty(copyCommand):copyCommand += &&
+            isEqual(QMAKE_DIR_SEP, \\) {
+                copyCommand += $(COPY_DIR) \"$$source\" \"$$target\"
+            } else {
+                source = $$replace(source, \\\\, /)
+                target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
+                target = $$replace(target, \\\\, /)
+                copyCommand += test -d \"$$target\" || mkdir -p \"$$target\" && cp -r \"$$source\" \"$$target\"
+            }
+        }
+    }
+    !isEmpty(copyCommand) {
+        copyCommand = @echo Copying application data... && $$copyCommand
+        copydeploymentfolders.commands = $$copyCommand
+        first.depends = $(first) copydeploymentfolders
+        export(first.depends)
+        export(copydeploymentfolders.commands)
+        QMAKE_EXTRA_TARGETS += first copydeploymentfolders
+    }
+} else:unix {
+    maemo5 {
+        installPrefix = /opt/$${TARGET}
+        desktopfile.files = $${TARGET}.desktop
+        desktopfile.path = /usr/share/applications/hildon
+        icon.files = $${TARGET}64.png
+        icon.path = /usr/share/icons/hicolor/64x64/apps
+    } else:!isEmpty(MEEGO_VERSION_MAJOR) {
+        installPrefix = /opt/$${TARGET}
+        desktopfile.files = $${TARGET}_harmattan.desktop
+        desktopfile.path = /usr/share/applications
+        icon.files = $${TARGET}80.png
+        icon.path = /usr/share/icons/hicolor/80x80/apps
+    } else { # Assumed to be a Desktop Unix
+        isEmpty(desktopInstallPrefix):installPrefix = $$[QT_INSTALL_DEMOS]/$${TARGET}
+        else:installPrefix = $$desktopInstallPrefix
+        copyCommand =
+        for(deploymentfolder, DEPLOYMENTFOLDERS) {
+            source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
+            source = $$replace(source, \\\\, /)
+            macx {
+                target = $$OUT_PWD/$${TARGET}.app/Contents/Resources/$$eval($${deploymentfolder}.target)
+            } else {
+                target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
+            }
+            target = $$replace(target, \\\\, /)
+            sourcePathSegments = $$split(source, /)
+            targetFullPath = $$target/$$last(sourcePathSegments)
+            targetFullPath ~= s,/\\.?/,/,
+            !isEqual(source,$$targetFullPath) {
+                !isEmpty(copyCommand):copyCommand += &&
+                copyCommand += $(MKDIR) \"$$target\"
+                copyCommand += && $(COPY_DIR) \"$$source\" \"$$target\"
+            }
+        }
+        !isEmpty(copyCommand) {
+            copyCommand = @echo Copying application data... && $$copyCommand
+            copydeploymentfolders.commands = $$copyCommand
+            first.depends = $(first) copydeploymentfolders
+            export(first.depends)
+            export(copydeploymentfolders.commands)
+            QMAKE_EXTRA_TARGETS += first copydeploymentfolders
+        }
+    }
+    for(deploymentfolder, DEPLOYMENTFOLDERS) {
+        item = item$${deploymentfolder}
+        itemfiles = $${item}.files
+        $$itemfiles = $$eval($${deploymentfolder}.source)
+        itempath = $${item}.path
+        $$itempath = $${installPrefix}/$$eval($${deploymentfolder}.target)
+        export($$itemfiles)
+        export($$itempath)
+        INSTALLS += $$item
+    }
+
+    !isEmpty(desktopfile.path) {
+        export(icon.files)
+        export(icon.path)
+        export(desktopfile.files)
+        export(desktopfile.path)
+        INSTALLS += icon desktopfile
+    }
+
+    target.path = $${installPrefix}/bin
+    export(target.path)
+    message($$target)
+    message($$installPrefix)
+    INSTALLS += target
+}
+
+export (ICON)
+export (INSTALLS)
+export (DEPLOYMENT)
+export (TARGET.EPOCHEAPSIZE)
+export (TARGET.CAPABILITY)
+export (LIBS)
+export (QMAKE_EXTRA_TARGETS)
+}
diff --git a/examples/tools/qmlapplicationviewer/qmlapplicationviewer.pri b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri.autosave
index c8bec697ba..d280874224 100644
--- a/examples/tools/qmlapplicationviewer/qmlapplicationviewer.pri
+++ b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri.autosave
@@ -74,16 +74,20 @@ symbian {
     }
 } else:unix {
     maemo5 {
+        installPrefix = /opt/$${TARGET}
         desktopfile.files = $${TARGET}.desktop
         desktopfile.path = /usr/share/applications/hildon
         icon.files = $${TARGET}64.png
         icon.path = /usr/share/icons/hicolor/64x64/apps
     } else:!isEmpty(MEEGO_VERSION_MAJOR) {
+        installPrefix = /opt/$${TARGET}
         desktopfile.files = $${TARGET}_harmattan.desktop
         desktopfile.path = /usr/share/applications
         icon.files = $${TARGET}80.png
         icon.path = /usr/share/icons/hicolor/80x80/apps
     } else { # Assumed to be a Desktop Unix
+        isEmpty(desktopInstallPrefix):installPrefix =   /$${TARGET}
+        else:installPrefix = $$desktopInstallPrefix
         copyCommand =
         for(deploymentfolder, DEPLOYMENTFOLDERS) {
             source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
@@ -112,7 +116,6 @@ symbian {
             QMAKE_EXTRA_TARGETS += first copydeploymentfolders
         }
     }
-    installPrefix = /opt/$${TARGET}
     for(deploymentfolder, DEPLOYMENTFOLDERS) {
         item = item$${deploymentfolder}
         itemfiles = $${item}.files