Declarative Examples: Fall back to local qmlapplicationviewer.

Rubberstamped-by: Oswald Buddenhagen

10 files changed, 21 insertions, 17 deletions

diff --git a/demos/declarative/calculator/calculator.pro b/demos/declarative/calculator/calculator.pro
index 9c91bccb0f..c41b600038 100644
--- a/demos/declarative/calculator/calculator.pro
+++ b/demos/declarative/calculator/calculator.pro
@@ -34,5 +34,6 @@ SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
 desktopInstallPrefix=$$[QT_INSTALL_DEMOS]/declarative/calculator
-include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
+exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
+else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/demos/declarative/declarative.pro b/demos/declarative/declarative.pro
index 29633861d2..338035795b 100644
--- a/demos/declarative/declarative.pro
+++ b/demos/declarative/declarative.pro
@@ -2,19 +2,14 @@ TEMPLATE = subdirs
 
 # These demos contain C++ and need to be compiled
 SUBDIRS = \
-    minehunt
-
-# These examples contain no C++ and can simply be copied
-sources.files = \
    calculator \
    flickr \
    photoviewer \
+   minehunt \
    samegame \
    snake \
-   twitter \
    rssnews \
-   webbrowser
+   twitter
 
-sources.path = $$[QT_INSTALL_DEMOS]/declarative
-INSTALLS += sources
+contains(QT_CONFIG, webkit):SUBDIRS += webbrowser
 
diff --git a/demos/declarative/flickr/flickr.pro b/demos/declarative/flickr/flickr.pro
index 1b45eee755..d607fa0b81 100644
--- a/demos/declarative/flickr/flickr.pro
+++ b/demos/declarative/flickr/flickr.pro
@@ -34,5 +34,6 @@ SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
 desktopInstallPrefix=$$[QT_INSTALL_DEMOS]/declarative/flickr
-include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
+exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
+else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/demos/declarative/minehunt/minehunt.pro b/demos/declarative/minehunt/minehunt.pro
index 17786f6967..29af4ccb1a 100644
--- a/demos/declarative/minehunt/minehunt.pro
+++ b/demos/declarative/minehunt/minehunt.pro
@@ -45,5 +45,6 @@ RESOURCES = minehunt.qrc
 
 # Please do not modify the following two lines. Required for deployment.
 desktopInstallPrefix=$$[QT_INSTALL_DEMOS]/declarative/minehunt
-include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
+exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
+else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/demos/declarative/photoviewer/photoviewer.pro b/demos/declarative/photoviewer/photoviewer.pro
index c44ba24da4..72b4315577 100644
--- a/demos/declarative/photoviewer/photoviewer.pro
+++ b/demos/declarative/photoviewer/photoviewer.pro
@@ -34,5 +34,6 @@ SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
 desktopInstallPrefix=$$[QT_INSTALL_DEMOS]/declarative/photoviewer
-include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
+exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
+else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/demos/declarative/rssnews/rssnews.pro b/demos/declarative/rssnews/rssnews.pro
index e15231156c..6b1f68c273 100644
--- a/demos/declarative/rssnews/rssnews.pro
+++ b/demos/declarative/rssnews/rssnews.pro
@@ -34,5 +34,6 @@ SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
 desktopInstallPrefix=$$[QT_INSTALL_DEMOS]/declarative/rssnews
-include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
+exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
+else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/demos/declarative/samegame/samegame.pro b/demos/declarative/samegame/samegame.pro
index 13a9f76e92..fb85cd220b 100644
--- a/demos/declarative/samegame/samegame.pro
+++ b/demos/declarative/samegame/samegame.pro
@@ -34,5 +34,6 @@ SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
 desktopInstallPrefix=$$[QT_INSTALL_DEMOS]/declarative/samegame
-include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
+exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
+else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/demos/declarative/snake/snake.pro b/demos/declarative/snake/snake.pro
index 4f562ab285..d9b7718964 100644
--- a/demos/declarative/snake/snake.pro
+++ b/demos/declarative/snake/snake.pro
@@ -34,5 +34,6 @@ SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
 desktopInstallPrefix=$$[QT_INSTALL_DEMOS]/declarative/snake
-include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
+exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
+else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/demos/declarative/twitter/twitter.pro b/demos/declarative/twitter/twitter.pro
index c8485bf592..91bfd47f17 100644
--- a/demos/declarative/twitter/twitter.pro
+++ b/demos/declarative/twitter/twitter.pro
@@ -34,5 +34,6 @@ SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
 desktopInstallPrefix=$$[QT_INSTALL_DEMOS]/declarative/twitter
-include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
+exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
+else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/demos/declarative/webbrowser/webbrowser.pro b/demos/declarative/webbrowser/webbrowser.pro
index d368832735..c640e889a6 100644
--- a/demos/declarative/webbrowser/webbrowser.pro
+++ b/demos/declarative/webbrowser/webbrowser.pro
@@ -34,5 +34,6 @@ SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
 desktopInstallPrefix=$$[QT_INSTALL_DEMOS]/declarative/webbrowser
-include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
+exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
+else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()