diff options
author | Topi Reinio <topi.reinio@digia.com> | 2012-11-05 11:08:56 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-05 14:40:07 +0100 |
commit | a14ab84c44ec4d791533bd0eb0f9c28a1a3cbe56 (patch) | |
tree | 7417e67fe5d5b03d5e29e60b9747293c54cb2396 /examples/demos | |
parent | 0f3a10e37839afab8ae759e74369b992df8bc318 (diff) |
Separate qtquick1 example install paths from qtdeclarative examplesv5.0.0-beta2
After QtQuick1 -> QtDeclarative name change (79fed875), the examples
both in qtquick1 and qtdeclarative use the same install path, causing
conflicts.
This change restores the install path used by qtquick1 examples as
its own subdirectory under QT_INSTALL_EXAMPLES.
Task-number: QTBUG-27823
Change-Id: Ica9ab8c5984642ace934e694cba346bcd3a1cb4c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'examples/demos')
-rw-r--r-- | examples/demos/calculator/calculator.pro | 2 | ||||
-rw-r--r-- | examples/demos/flickr/flickr.pro | 2 | ||||
-rw-r--r-- | examples/demos/minehunt/minehunt.pro | 2 | ||||
-rw-r--r-- | examples/demos/photoviewer/photoviewer.pro | 2 | ||||
-rw-r--r-- | examples/demos/rssnews/rssnews.pro | 2 | ||||
-rw-r--r-- | examples/demos/samegame/samegame.pro | 2 | ||||
-rw-r--r-- | examples/demos/snake/snake.pro | 2 | ||||
-rw-r--r-- | examples/demos/twitter/twitter.pro | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/examples/demos/calculator/calculator.pro b/examples/demos/calculator/calculator.pro index f59289be..7db59b96 100644 --- a/examples/demos/calculator/calculator.pro +++ b/examples/demos/calculator/calculator.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/calculator +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/calculator exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/flickr/flickr.pro b/examples/demos/flickr/flickr.pro index 74342fbc..625b2a57 100644 --- a/examples/demos/flickr/flickr.pro +++ b/examples/demos/flickr/flickr.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/flickr +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/flickr exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/minehunt/minehunt.pro b/examples/demos/minehunt/minehunt.pro index 8c7f5bbf..2a43a11f 100644 --- a/examples/demos/minehunt/minehunt.pro +++ b/examples/demos/minehunt/minehunt.pro @@ -19,7 +19,7 @@ SOURCES += main.cpp minehunt.cpp RESOURCES = minehunt.qrc # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/minehunt +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/minehunt exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/photoviewer/photoviewer.pro b/examples/demos/photoviewer/photoviewer.pro index 1b1490cb..694aeb36 100644 --- a/examples/demos/photoviewer/photoviewer.pro +++ b/examples/demos/photoviewer/photoviewer.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/photoviewer +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/photoviewer exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/rssnews/rssnews.pro b/examples/demos/rssnews/rssnews.pro index 04ff5ae9..14002fb1 100644 --- a/examples/demos/rssnews/rssnews.pro +++ b/examples/demos/rssnews/rssnews.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/rssnews +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/rssnews exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/samegame/samegame.pro b/examples/demos/samegame/samegame.pro index 10b28698..6342ba4a 100644 --- a/examples/demos/samegame/samegame.pro +++ b/examples/demos/samegame/samegame.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/samegame +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/samegame exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/snake/snake.pro b/examples/demos/snake/snake.pro index 427f570a..0fa838d5 100644 --- a/examples/demos/snake/snake.pro +++ b/examples/demos/snake/snake.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/snake +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/snake exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/twitter/twitter.pro b/examples/demos/twitter/twitter.pro index 9a699799..c2beb0e3 100644 --- a/examples/demos/twitter/twitter.pro +++ b/examples/demos/twitter/twitter.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/twitter +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/twitter exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() |