From a14ab84c44ec4d791533bd0eb0f9c28a1a3cbe56 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Mon, 5 Nov 2012 11:08:56 +0100 Subject: Separate qtquick1 example install paths from qtdeclarative examples 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 Reviewed-by: Jerome Pasion --- .../animation/basics/color-animation/color-animation.pro | 2 +- .../animation/basics/property-animation/property-animation.pro | 2 +- .../animation/behaviors/behavior-example/behavior-example.pro | 2 +- examples/declarative/animation/behaviors/wigglytext/wigglytext.pro | 2 +- examples/declarative/animation/easing/easing.pro | 2 +- examples/declarative/animation/states/states.pro | 2 +- examples/declarative/cppextensions/imageprovider/imageprovider.pro | 6 +++--- .../networkaccessmanagerfactory/networkaccessmanagerfactory.pro | 2 +- examples/declarative/cppextensions/plugins/plugins.pro | 6 +++--- .../qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro | 2 +- .../qgraphicslinearlayout/qgraphicslinearlayout.pro | 2 +- examples/declarative/cppextensions/qwidgets/qwidgets.pro | 4 ++-- .../declarative/cppextensions/referenceexamples/adding/adding.pro | 4 ++-- .../cppextensions/referenceexamples/attached/attached.pro | 4 ++-- .../declarative/cppextensions/referenceexamples/binding/binding.pro | 4 ++-- .../cppextensions/referenceexamples/coercion/coercion.pro | 4 ++-- .../declarative/cppextensions/referenceexamples/default/default.pro | 4 ++-- .../cppextensions/referenceexamples/extended/extended.pro | 4 ++-- .../declarative/cppextensions/referenceexamples/grouped/grouped.pro | 4 ++-- .../declarative/cppextensions/referenceexamples/methods/methods.pro | 4 ++-- .../cppextensions/referenceexamples/properties/properties.pro | 4 ++-- .../declarative/cppextensions/referenceexamples/signal/signal.pro | 4 ++-- .../cppextensions/referenceexamples/valuesource/valuesource.pro | 4 ++-- examples/declarative/declarative.pro | 2 +- examples/declarative/i18n/i18n.pro | 2 +- examples/declarative/imageelements/borderimage/borderimage.pro | 2 +- examples/declarative/imageelements/image/image.pro | 2 +- examples/declarative/imageelements/shadows/shadows.pro | 2 +- examples/declarative/keyinteraction/focus/focus.pro | 2 +- .../declarative/modelviews/abstractitemmodel/abstractitemmodel.pro | 2 +- examples/declarative/modelviews/gridview/gridview.pro | 2 +- .../declarative/modelviews/listview/dynamiclist/dynamiclist.pro | 2 +- .../modelviews/listview/expandingdelegates/expandingdelegates.pro | 2 +- examples/declarative/modelviews/listview/highlight/highlight.pro | 2 +- .../modelviews/listview/highlightranges/highlightranges.pro | 2 +- examples/declarative/modelviews/listview/sections/sections.pro | 2 +- examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro | 2 +- examples/declarative/modelviews/package/package.pro | 2 +- examples/declarative/modelviews/parallax/parallax.pro | 2 +- examples/declarative/modelviews/pathview/pathview.pro | 2 +- examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro | 2 +- examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro | 2 +- examples/declarative/positioners/positioners.pro | 2 +- .../declarative/righttoleft/layoutdirection/layoutdirection.pro | 2 +- .../declarative/righttoleft/layoutmirroring/layoutmirroring.pro | 2 +- examples/declarative/righttoleft/textalignment/textalignment.pro | 2 +- examples/declarative/shadereffects/shadereffects.pro | 2 +- examples/declarative/sqllocalstorage/sqllocalstorage.pro | 2 +- examples/declarative/text/fonts/availableFonts/availableFonts.pro | 2 +- examples/declarative/text/fonts/banner/banner.pro | 2 +- examples/declarative/text/fonts/fonts/fonts.pro | 2 +- examples/declarative/text/fonts/hello/hello.pro | 2 +- examples/declarative/text/textselection/textselection.pro | 2 +- .../declarative/threading/threadedlistmodel/threadedlistmodel.pro | 2 +- examples/declarative/threading/workerscript/workerscript.pro | 2 +- .../gestures/experimental-gestures/experimentalgestures.pro | 2 +- .../mousearea/mousearea-example/mouseareaexample.pro | 2 +- examples/declarative/touchinteraction/pincharea/pincharea.pro | 2 +- examples/declarative/toys/clocks/clocks.pro | 2 +- examples/declarative/toys/corkboards/corkboards.pro | 2 +- examples/declarative/toys/dynamicscene/dynamicscene.pro | 2 +- examples/declarative/toys/tic-tac-toe/tictactoe.pro | 2 +- examples/declarative/toys/tvtennis/tvtennis.pro | 2 +- examples/declarative/ui-components/dialcontrol/dialcontrol.pro | 2 +- examples/declarative/ui-components/flipable/flipable.pro | 2 +- examples/declarative/ui-components/main/main.pro | 2 +- examples/declarative/ui-components/progressbar/progressbar.pro | 2 +- examples/declarative/ui-components/scrollbar/scrollbar.pro | 2 +- examples/declarative/ui-components/searchbox/searchbox.pro | 2 +- examples/declarative/ui-components/slideswitch/slideswitch.pro | 2 +- examples/declarative/ui-components/spinner/spinner.pro | 2 +- examples/declarative/ui-components/tabwidget/tabwidget.pro | 2 +- .../xml/xmlhttprequest-example/xmlhttprequestexample.pro | 2 +- examples/demos/calculator/calculator.pro | 2 +- examples/demos/flickr/flickr.pro | 2 +- examples/demos/minehunt/minehunt.pro | 2 +- examples/demos/photoviewer/photoviewer.pro | 2 +- examples/demos/rssnews/rssnews.pro | 2 +- examples/demos/samegame/samegame.pro | 2 +- examples/demos/snake/snake.pro | 2 +- examples/demos/twitter/twitter.pro | 2 +- examples/helper/helper.pro | 2 +- 82 files changed, 98 insertions(+), 98 deletions(-) diff --git a/examples/declarative/animation/basics/color-animation/color-animation.pro b/examples/declarative/animation/basics/color-animation/color-animation.pro index eecab9bb..11dd9d13 100644 --- a/examples/declarative/animation/basics/color-animation/color-animation.pro +++ b/examples/declarative/animation/basics/color-animation/color-animation.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/animation/basics/color-animation +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/basics/color-animation exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/animation/basics/property-animation/property-animation.pro b/examples/declarative/animation/basics/property-animation/property-animation.pro index 61e165c8..28e7ebc3 100644 --- a/examples/declarative/animation/basics/property-animation/property-animation.pro +++ b/examples/declarative/animation/basics/property-animation/property-animation.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/animation/basics/property-animation +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/basics/property-animation exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro b/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro index 70b6187f..b1b3cd6b 100644 --- a/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro +++ b/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/animation/behaviors/behavior-example +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/behaviors/behavior-example exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro b/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro index 2c9cd4f2..4c46a119 100644 --- a/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro +++ b/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro @@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xEB6022A4 SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/animation/wigglytext/wigglytext +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/animation/wigglytext/wigglytext exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/animation/easing/easing.pro b/examples/declarative/animation/easing/easing.pro index 34007253..ac80ef7a 100644 --- a/examples/declarative/animation/easing/easing.pro +++ b/examples/declarative/animation/easing/easing.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/animation/easing +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/easing exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/animation/states/states.pro b/examples/declarative/animation/states/states.pro index b188c70a..9a469a68 100644 --- a/examples/declarative/animation/states/states.pro +++ b/examples/declarative/animation/states/states.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/animation/states +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/states exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro index 0d24c035..9e698d88 100644 --- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro +++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro @@ -10,13 +10,13 @@ SOURCES += imageprovider.cpp OTHER_FILES += imageprovider.json sources.files = $$SOURCES imageprovider.qml imageprovider.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/imageprovider +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/imageprovider -target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/imageprovider/ImageProviderCore +target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/imageprovider/ImageProviderCore ImageProviderCore_sources.files = \ ImageProviderCore/qmldir -ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/imageprovider/ImageProviderCore +ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/imageprovider/ImageProviderCore INSTALLS = sources ImageProviderCore_sources target diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro b/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro index e8103794..4048dfd9 100644 --- a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro +++ b/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro @@ -21,7 +21,7 @@ SOURCES += main.cpp RESOURCES += networkaccessmanagerfactory.qrc # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/networkaccessmanagerfactory +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/networkaccessmanagerfactory exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/cppextensions/plugins/plugins.pro b/examples/declarative/cppextensions/plugins/plugins.pro index 0d6fe43e..053e6c44 100644 --- a/examples/declarative/cppextensions/plugins/plugins.pro +++ b/examples/declarative/cppextensions/plugins/plugins.pro @@ -17,11 +17,11 @@ qdeclarativesources.files += \ com/nokia/TimeExample/hour.png \ com/nokia/TimeExample/minute.png -qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/plugins/com/nokia/TimeExample +qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins/com/nokia/TimeExample sources.files += plugins.pro plugin.cpp plugins.qml README -sources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/plugins -target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/plugins/com/nokia/TimeExample +sources.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins +target.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins/com/nokia/TimeExample INSTALLS += qdeclarativesources sources target diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro index 4ad99b56..794979c4 100644 --- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro +++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro @@ -28,7 +28,7 @@ RESOURCES += \ gridlayout.qrc # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else: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 cb070816..da9b9939 100644 --- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro +++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro @@ -28,7 +28,7 @@ RESOURCES += \ linearlayout.qrc # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.pro b/examples/declarative/cppextensions/qwidgets/qwidgets.pro index e0d17715..3c0c865a 100644 --- a/examples/declarative/cppextensions/qwidgets/qwidgets.pro +++ b/examples/declarative/cppextensions/qwidgets/qwidgets.pro @@ -10,8 +10,8 @@ SOURCES += qwidgets.cpp OTHER_FILES += qwidgets.json sources.files += qwidgets.pro qwidgets.cpp qwidgets.qml -sources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/plugins -target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/plugins +sources.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins +target.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins INSTALLS += sources target diff --git a/examples/declarative/cppextensions/referenceexamples/adding/adding.pro b/examples/declarative/cppextensions/referenceexamples/adding/adding.pro index a4718886..57179384 100644 --- a/examples/declarative/cppextensions/referenceexamples/adding/adding.pro +++ b/examples/declarative/cppextensions/referenceexamples/adding/adding.pro @@ -5,7 +5,7 @@ SOURCES += main.cpp \ HEADERS += person.h RESOURCES += adding.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/adding +target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/adding sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS adding.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/adding +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/adding INSTALLS += target sources diff --git a/examples/declarative/cppextensions/referenceexamples/attached/attached.pro b/examples/declarative/cppextensions/referenceexamples/attached/attached.pro index 8a5bc14c..2c24fcbd 100644 --- a/examples/declarative/cppextensions/referenceexamples/attached/attached.pro +++ b/examples/declarative/cppextensions/referenceexamples/attached/attached.pro @@ -7,7 +7,7 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += attached.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/attached +target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/attached sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS attached.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/attached +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/attached INSTALLS += target sources diff --git a/examples/declarative/cppextensions/referenceexamples/binding/binding.pro b/examples/declarative/cppextensions/referenceexamples/binding/binding.pro index 281ca7e0..7b269491 100644 --- a/examples/declarative/cppextensions/referenceexamples/binding/binding.pro +++ b/examples/declarative/cppextensions/referenceexamples/binding/binding.pro @@ -9,7 +9,7 @@ HEADERS += person.h \ happybirthdaysong.h RESOURCES += binding.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/binding +target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/binding sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS binding.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/binding +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/binding INSTALLS += target sources diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro b/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro index b89db7a5..29b905ca 100644 --- a/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro +++ b/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro @@ -7,7 +7,7 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += coercion.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/coercion +target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/coercion sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS coercion.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/coercion +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/coercion INSTALLS += target sources diff --git a/examples/declarative/cppextensions/referenceexamples/default/default.pro b/examples/declarative/cppextensions/referenceexamples/default/default.pro index 3d0b3405..235aa317 100644 --- a/examples/declarative/cppextensions/referenceexamples/default/default.pro +++ b/examples/declarative/cppextensions/referenceexamples/default/default.pro @@ -7,7 +7,7 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += default.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/default +target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/default sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS default.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/default +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/default INSTALLS += target sources diff --git a/examples/declarative/cppextensions/referenceexamples/extended/extended.pro b/examples/declarative/cppextensions/referenceexamples/extended/extended.pro index f9485f67..8acc21de 100644 --- a/examples/declarative/cppextensions/referenceexamples/extended/extended.pro +++ b/examples/declarative/cppextensions/referenceexamples/extended/extended.pro @@ -5,7 +5,7 @@ SOURCES += main.cpp \ HEADERS += lineedit.h RESOURCES += extended.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/extended +target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/extended sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS extended.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/extended +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/extended INSTALLS += target sources diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro b/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro index 5bf40ddd..3d98260a 100644 --- a/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro +++ b/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro @@ -7,7 +7,7 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += grouped.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/grouped +target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/grouped sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS grouped.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/grouped +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/grouped INSTALLS += target sources diff --git a/examples/declarative/cppextensions/referenceexamples/methods/methods.pro b/examples/declarative/cppextensions/referenceexamples/methods/methods.pro index b9310c14..105007a0 100644 --- a/examples/declarative/cppextensions/referenceexamples/methods/methods.pro +++ b/examples/declarative/cppextensions/referenceexamples/methods/methods.pro @@ -7,7 +7,7 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += methods.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/methods +target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/methods sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS methods.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/methods +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/methods INSTALLS += target sources diff --git a/examples/declarative/cppextensions/referenceexamples/properties/properties.pro b/examples/declarative/cppextensions/referenceexamples/properties/properties.pro index 5bc57983..d6c547a2 100644 --- a/examples/declarative/cppextensions/referenceexamples/properties/properties.pro +++ b/examples/declarative/cppextensions/referenceexamples/properties/properties.pro @@ -7,7 +7,7 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += properties.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/properties +target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/properties sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS properties.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/properties +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/properties INSTALLS += target sources diff --git a/examples/declarative/cppextensions/referenceexamples/signal/signal.pro b/examples/declarative/cppextensions/referenceexamples/signal/signal.pro index 2b850245..d62fb200 100644 --- a/examples/declarative/cppextensions/referenceexamples/signal/signal.pro +++ b/examples/declarative/cppextensions/referenceexamples/signal/signal.pro @@ -7,7 +7,7 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += signal.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/signal +target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/signal sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS signal.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/signal +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/signal INSTALLS += target sources diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro b/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro index c32e5a2d..1af33152 100644 --- a/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro +++ b/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro @@ -9,7 +9,7 @@ HEADERS += person.h \ happybirthdaysong.h RESOURCES += valuesource.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/valuesource +target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/valuesource sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS valuesource.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/valuesource +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/valuesource INSTALLS += target sources diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro index 42bc3f4a..7fe8f957 100644 --- a/examples/declarative/declarative.pro +++ b/examples/declarative/declarative.pro @@ -25,5 +25,5 @@ sources.files = \ cppextensions \ xml -sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative INSTALLS += sources diff --git a/examples/declarative/i18n/i18n.pro b/examples/declarative/i18n/i18n.pro index 951b2611..abae210e 100644 --- a/examples/declarative/i18n/i18n.pro +++ b/examples/declarative/i18n/i18n.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/i18n +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/i18n exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) diff --git a/examples/declarative/imageelements/borderimage/borderimage.pro b/examples/declarative/imageelements/borderimage/borderimage.pro index eab55135..5cfc2e5b 100644 --- a/examples/declarative/imageelements/borderimage/borderimage.pro +++ b/examples/declarative/imageelements/borderimage/borderimage.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/imageelements/borderimage +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/imageelements/borderimage exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/imageelements/image/image.pro b/examples/declarative/imageelements/image/image.pro index 41560539..d19b6fde 100644 --- a/examples/declarative/imageelements/image/image.pro +++ b/examples/declarative/imageelements/image/image.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/imageelements/image +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/imageelements/image exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/imageelements/shadows/shadows.pro b/examples/declarative/imageelements/shadows/shadows.pro index d12cb7ca..035a06a6 100644 --- a/examples/declarative/imageelements/shadows/shadows.pro +++ b/examples/declarative/imageelements/shadows/shadows.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/imageelements/shadows +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/imageelements/shadows exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/keyinteraction/focus/focus.pro b/examples/declarative/keyinteraction/focus/focus.pro index b6fd6856..584a80bf 100644 --- a/examples/declarative/keyinteraction/focus/focus.pro +++ b/examples/declarative/keyinteraction/focus/focus.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/keyinteraction/focus +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/keyinteraction/focus exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro index 164ed233..7ba55ba6 100644 --- a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro +++ b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro @@ -21,7 +21,7 @@ SOURCES = main.cpp model.cpp HEADERS = model.h # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/abstractitemmodel +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/abstractitemmodel exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/gridview/gridview.pro b/examples/declarative/modelviews/gridview/gridview.pro index 967ca931..5ff68def 100644 --- a/examples/declarative/modelviews/gridview/gridview.pro +++ b/examples/declarative/modelviews/gridview/gridview.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/gridview-example +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/gridview-example exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else: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 272ff7d3..c37afe45 100644 --- a/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro +++ b/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/listview/dynamiclist +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/dynamiclist exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else: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 73a32e44..1ddbb46f 100644 --- a/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro +++ b/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/listview/expandingdelegates +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/expandingdelegates exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else: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 220dae9e..062de0a7 100644 --- a/examples/declarative/modelviews/listview/highlight/highlight.pro +++ b/examples/declarative/modelviews/listview/highlight/highlight.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/listview/highlight +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/highlight exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else: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 0faf1a8f..b27e2c06 100644 --- a/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro +++ b/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/listview/highlightranges +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/highlightranges exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else: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 699a8e4e..edad3e58 100644 --- a/examples/declarative/modelviews/listview/sections/sections.pro +++ b/examples/declarative/modelviews/listview/sections/sections.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/listview/sections +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/sections exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro index 790946cd..d37bd87b 100644 --- a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro +++ b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro @@ -22,7 +22,7 @@ SOURCES += main.cpp \ HEADERS += dataobject.h # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/objectlistmodel +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/objectlistmodel exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/package/package.pro b/examples/declarative/modelviews/package/package.pro index 6d7a1fab..d68cdcc8 100644 --- a/examples/declarative/modelviews/package/package.pro +++ b/examples/declarative/modelviews/package/package.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/declarative/modelviews/package +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/package exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/parallax/parallax.pro b/examples/declarative/modelviews/parallax/parallax.pro index 51307e54..cf21b699 100644 --- a/examples/declarative/modelviews/parallax/parallax.pro +++ b/examples/declarative/modelviews/parallax/parallax.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/declarative/modelviews/parallax +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/parallax exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/pathview/pathview.pro b/examples/declarative/modelviews/pathview/pathview.pro index 9bd27e18..9b00ce2c 100644 --- a/examples/declarative/modelviews/pathview/pathview.pro +++ b/examples/declarative/modelviews/pathview/pathview.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/pathview-example +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/pathview-example exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro b/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro index e7221f02..8d326922 100644 --- a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro +++ b/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro @@ -20,7 +20,7 @@ QT += widgets SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/stringlistmodel +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/stringlistmodel exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro index 19ea9469..7309eea1 100644 --- a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro +++ b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/visualitemmodel +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/visualitemmodel exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/positioners/positioners.pro b/examples/declarative/positioners/positioners.pro index c6b26fb8..1991997a 100644 --- a/examples/declarative/positioners/positioners.pro +++ b/examples/declarative/positioners/positioners.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/positioners +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/positioners exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) diff --git a/examples/declarative/righttoleft/layoutdirection/layoutdirection.pro b/examples/declarative/righttoleft/layoutdirection/layoutdirection.pro index dd33b64a..402d8344 100644 --- a/examples/declarative/righttoleft/layoutdirection/layoutdirection.pro +++ b/examples/declarative/righttoleft/layoutdirection/layoutdirection.pro @@ -33,7 +33,7 @@ symbian:TARGET.CAPABILITY += NetworkServices SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/righttoleft/layoutdirection +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/righttoleft/layoutdirection exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.pro b/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.pro index f45ca74e..eb6ab5c5 100644 --- a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.pro +++ b/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.pro @@ -33,7 +33,7 @@ symbian:TARGET.CAPABILITY += NetworkServices SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/righttoleft/layoutmirroring +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/righttoleft/layoutmirroring exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/righttoleft/textalignment/textalignment.pro b/examples/declarative/righttoleft/textalignment/textalignment.pro index f9d164ea..fd2ee263 100644 --- a/examples/declarative/righttoleft/textalignment/textalignment.pro +++ b/examples/declarative/righttoleft/textalignment/textalignment.pro @@ -33,7 +33,7 @@ symbian:TARGET.CAPABILITY += NetworkServices SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/righttoleft/textalignment +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/righttoleft/textalignment exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/shadereffects/shadereffects.pro b/examples/declarative/shadereffects/shadereffects.pro index d8d0df19..742903e3 100644 --- a/examples/declarative/shadereffects/shadereffects.pro +++ b/examples/declarative/shadereffects/shadereffects.pro @@ -24,7 +24,7 @@ symbian { } # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/shadereffects +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/shadereffects exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) diff --git a/examples/declarative/sqllocalstorage/sqllocalstorage.pro b/examples/declarative/sqllocalstorage/sqllocalstorage.pro index bb5a1323..631cff40 100644 --- a/examples/declarative/sqllocalstorage/sqllocalstorage.pro +++ b/examples/declarative/sqllocalstorage/sqllocalstorage.pro @@ -19,7 +19,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/sqllocalstorage +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/sqllocalstorage exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) diff --git a/examples/declarative/text/fonts/availableFonts/availableFonts.pro b/examples/declarative/text/fonts/availableFonts/availableFonts.pro index e8fc381b..a175e3d5 100644 --- a/examples/declarative/text/fonts/availableFonts/availableFonts.pro +++ b/examples/declarative/text/fonts/availableFonts/availableFonts.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/text/fonts/availableFonts +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text/fonts/availableFonts exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else: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 f3fba2e6..ab6f3e56 100644 --- a/examples/declarative/text/fonts/banner/banner.pro +++ b/examples/declarative/text/fonts/banner/banner.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/text/fonts/banner +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text/fonts/banner exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else: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 c5382311..1e10fc17 100644 --- a/examples/declarative/text/fonts/fonts/fonts.pro +++ b/examples/declarative/text/fonts/fonts/fonts.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/text/fonts/fonts +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text/fonts/fonts exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else: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 a6a685c2..8a7752a8 100644 --- a/examples/declarative/text/fonts/hello/hello.pro +++ b/examples/declarative/text/fonts/hello/hello.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/text/fonts/hello +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text/fonts/hello exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/text/textselection/textselection.pro b/examples/declarative/text/textselection/textselection.pro index 20450b2d..327efad9 100644 --- a/examples/declarative/text/textselection/textselection.pro +++ b/examples/declarative/text/textselection/textselection.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/text/textselection +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text/textselection exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/threading/threadedlistmodel/threadedlistmodel.pro b/examples/declarative/threading/threadedlistmodel/threadedlistmodel.pro index 409f792e..35f203f1 100644 --- a/examples/declarative/threading/threadedlistmodel/threadedlistmodel.pro +++ b/examples/declarative/threading/threadedlistmodel/threadedlistmodel.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/declarative/threading/threadedlistmodel +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/threading/threadedlistmodel exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/threading/workerscript/workerscript.pro b/examples/declarative/threading/workerscript/workerscript.pro index e7f1a2aa..b92a2745 100644 --- a/examples/declarative/threading/workerscript/workerscript.pro +++ b/examples/declarative/threading/workerscript/workerscript.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/declarative/threading/workerscript +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/threading/workerscript exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else: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 a81a0219..db652cc3 100644 --- a/examples/declarative/touchinteraction/gestures/experimental-gestures/experimentalgestures.pro +++ b/examples/declarative/touchinteraction/gestures/experimental-gestures/experimentalgestures.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/touchinteraction/gestures/experimental-gestures +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/touchinteraction/gestures/experimental-gestures exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else: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 ce5bbd3f..c55b883c 100644 --- a/examples/declarative/touchinteraction/mousearea/mousearea-example/mouseareaexample.pro +++ b/examples/declarative/touchinteraction/mousearea/mousearea-example/mouseareaexample.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/touchinteraction/mousearea/mousearea-example +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/touchinteraction/mousearea/mousearea-example exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/touchinteraction/pincharea/pincharea.pro b/examples/declarative/touchinteraction/pincharea/pincharea.pro index a7ae4561..6a2e9dd3 100644 --- a/examples/declarative/touchinteraction/pincharea/pincharea.pro +++ b/examples/declarative/touchinteraction/pincharea/pincharea.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/declarative/touchinteraction/pincharea +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/touchinteraction/pincharea exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/toys/clocks/clocks.pro b/examples/declarative/toys/clocks/clocks.pro index 6fc6c58c..483924e1 100644 --- a/examples/declarative/toys/clocks/clocks.pro +++ b/examples/declarative/toys/clocks/clocks.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/toys/clocks +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/toys/clocks exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/toys/corkboards/corkboards.pro b/examples/declarative/toys/corkboards/corkboards.pro index 810adf04..61e141fa 100644 --- a/examples/declarative/toys/corkboards/corkboards.pro +++ b/examples/declarative/toys/corkboards/corkboards.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/toys/corkboards +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/toys/corkboards exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/toys/dynamicscene/dynamicscene.pro b/examples/declarative/toys/dynamicscene/dynamicscene.pro index 3a177275..5d19757b 100644 --- a/examples/declarative/toys/dynamicscene/dynamicscene.pro +++ b/examples/declarative/toys/dynamicscene/dynamicscene.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/toys/dynamicscene +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/toys/dynamicscene exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else: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 9547c913..4a669f6f 100644 --- a/examples/declarative/toys/tic-tac-toe/tictactoe.pro +++ b/examples/declarative/toys/tic-tac-toe/tictactoe.pro @@ -24,7 +24,7 @@ TARGET = tic-tac-toe SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/toys/tic-tac-toe +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/toys/tic-tac-toe exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/toys/tvtennis/tvtennis.pro b/examples/declarative/toys/tvtennis/tvtennis.pro index 3f843595..2b4cc07e 100644 --- a/examples/declarative/toys/tvtennis/tvtennis.pro +++ b/examples/declarative/toys/tvtennis/tvtennis.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/toys/tvtennis +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/toys/tvtennis exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else: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 741c0429..5e112a8d 100644 --- a/examples/declarative/ui-components/dialcontrol/dialcontrol.pro +++ b/examples/declarative/ui-components/dialcontrol/dialcontrol.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/dialcontrol +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/dialcontrol exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else: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 9707142b..0cfd2ec2 100644 --- a/examples/declarative/ui-components/flipable/flipable.pro +++ b/examples/declarative/ui-components/flipable/flipable.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/flipable +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/flipable exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else: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 c0e53864..428ffd47 100644 --- a/examples/declarative/ui-components/main/main.pro +++ b/examples/declarative/ui-components/main/main.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/main +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/main exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else: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 5557daba..8e232277 100644 --- a/examples/declarative/ui-components/progressbar/progressbar.pro +++ b/examples/declarative/ui-components/progressbar/progressbar.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/progressbar +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/progressbar exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else: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 c29a02dc..5843ef7f 100644 --- a/examples/declarative/ui-components/scrollbar/scrollbar.pro +++ b/examples/declarative/ui-components/scrollbar/scrollbar.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/declarative/ui-components/scrollbar +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/scrollbar exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else: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 56c060b8..6219524f 100644 --- a/examples/declarative/ui-components/searchbox/searchbox.pro +++ b/examples/declarative/ui-components/searchbox/searchbox.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/declarative/ui-components/searchbox +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/searchbox exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else: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 77b3d996..63e471cf 100644 --- a/examples/declarative/ui-components/slideswitch/slideswitch.pro +++ b/examples/declarative/ui-components/slideswitch/slideswitch.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/slideswitch +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/slideswitch exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else: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 20a686da..0c65f28d 100644 --- a/examples/declarative/ui-components/spinner/spinner.pro +++ b/examples/declarative/ui-components/spinner/spinner.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/declarative/ui-components/spinner +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/spinner exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else: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 caa03212..97d49ea2 100644 --- a/examples/declarative/ui-components/tabwidget/tabwidget.pro +++ b/examples/declarative/ui-components/tabwidget/tabwidget.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/declarative/ui-components/tabwidget +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/tabwidget exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else: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 c6be2562..9c75b8b0 100644 --- a/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.pro +++ b/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/xml/xmlhttprequest-example +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/xml/xmlhttprequest-example exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() 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() diff --git a/examples/helper/helper.pro b/examples/helper/helper.pro index 52593b9a..7bb540df 100644 --- a/examples/helper/helper.pro +++ b/examples/helper/helper.pro @@ -4,5 +4,5 @@ TEMPLATE = subdirs sources.files = \ qmlapplicationviewer \ deployment.pri -sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/helper +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/helper INSTALLS += sources -- cgit v1.2.3