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

9 files changed, 18 insertions, 9 deletions

diff --git a/demos/declarative/calculator/calculator.pro b/demos/declarative/calculator/calculator.pro
index 697a0d8..9c91bcc 100644
--- a/demos/declarative/calculator/calculator.pro
+++ b/demos/declarative/calculator/calculator.pro
@@ -33,5 +33,6 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../examples/tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_DEMOS]/declarative/calculator
+include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/demos/declarative/flickr/flickr.pro b/demos/declarative/flickr/flickr.pro
index 30206f8..1b45eee 100644
--- a/demos/declarative/flickr/flickr.pro
+++ b/demos/declarative/flickr/flickr.pro
@@ -33,5 +33,6 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../examples/tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_DEMOS]/declarative/flickr
+include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/demos/declarative/minehunt/minehunt.pro b/demos/declarative/minehunt/minehunt.pro
index 4eed9c1..17786f6 100644
--- a/demos/declarative/minehunt/minehunt.pro
+++ b/demos/declarative/minehunt/minehunt.pro
@@ -44,5 +44,6 @@ SOURCES += main.cpp minehunt.cpp
 RESOURCES = minehunt.qrc
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../examples/tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_DEMOS]/declarative/minehunt
+include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/demos/declarative/photoviewer/photoviewer.pro b/demos/declarative/photoviewer/photoviewer.pro
index cdfab1e..c44ba24 100644
--- a/demos/declarative/photoviewer/photoviewer.pro
+++ b/demos/declarative/photoviewer/photoviewer.pro
@@ -33,5 +33,6 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../examples/tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_DEMOS]/declarative/photoviewer
+include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/demos/declarative/rssnews/rssnews.pro b/demos/declarative/rssnews/rssnews.pro
index 30dd524..e152311 100644
--- a/demos/declarative/rssnews/rssnews.pro
+++ b/demos/declarative/rssnews/rssnews.pro
@@ -33,5 +33,6 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../examples/tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_DEMOS]/declarative/rssnews
+include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/demos/declarative/samegame/samegame.pro b/demos/declarative/samegame/samegame.pro
index 1a2455b..13a9f76 100644
--- a/demos/declarative/samegame/samegame.pro
+++ b/demos/declarative/samegame/samegame.pro
@@ -33,5 +33,6 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../examples/tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_DEMOS]/declarative/samegame
+include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/demos/declarative/snake/snake.pro b/demos/declarative/snake/snake.pro
index 81b2dfc..4f562ab 100644
--- a/demos/declarative/snake/snake.pro
+++ b/demos/declarative/snake/snake.pro
@@ -33,5 +33,6 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../examples/tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_DEMOS]/declarative/snake
+include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/demos/declarative/twitter/twitter.pro b/demos/declarative/twitter/twitter.pro
index a45f338..c8485bf 100644
--- a/demos/declarative/twitter/twitter.pro
+++ b/demos/declarative/twitter/twitter.pro
@@ -33,5 +33,6 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../examples/tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_DEMOS]/declarative/twitter
+include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/demos/declarative/webbrowser/webbrowser.pro b/demos/declarative/webbrowser/webbrowser.pro
index 2a7bdbd..d368832 100644
--- a/demos/declarative/webbrowser/webbrowser.pro
+++ b/demos/declarative/webbrowser/webbrowser.pro
@@ -33,5 +33,6 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-include(../../../examples/tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+desktopInstallPrefix=$$[QT_INSTALL_DEMOS]/declarative/webbrowser
+include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()