diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-11-22 14:38:19 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-22 14:42:48 +0100 |
commit | 22059766f799874b931f4369c0b1ec6bb3a4bb21 (patch) | |
tree | 7fa45ae23fce607d5606cf871c2963de0544045c /examples/declarative | |
parent | be2cb6c919d3af82bf53e9c5a7e94c93268d893a (diff) | |
download | qtquick1-22059766f799874b931f4369c0b1ec6bb3a4bb21.tar.gz |
Fix building of examples.
- Correct install paths.
- Add missing subdir-.pro files.
- Add missing resources.
Task-number: QTBUG-27977
Change-Id: Ia8293cbaa7b32280181f41bde5b6e517989571f8
Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'examples/declarative')
22 files changed, 103 insertions, 3 deletions
diff --git a/examples/declarative/animation/animation.pro b/examples/declarative/animation/animation.pro index a71df66d..6ac1b645 100644 --- a/examples/declarative/animation/animation.pro +++ b/examples/declarative/animation/animation.pro @@ -6,3 +6,8 @@ SUBDIRS += \ easing \ behaviors/behavior-example \ states + +# install +sources.files = animation.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation +INSTALLS += sources diff --git a/examples/declarative/cppextensions/cppextensions.pro b/examples/declarative/cppextensions/cppextensions.pro index 33762feb..96550307 100644 --- a/examples/declarative/cppextensions/cppextensions.pro +++ b/examples/declarative/cppextensions/cppextensions.pro @@ -8,3 +8,7 @@ SUBDIRS += \ qgraphicslayouts \ referenceexamples +# install +sources.files = cppextensions.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions +INSTALLS += sources diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro index 7fe8f957..c2e93d55 100644 --- a/examples/declarative/declarative.pro +++ b/examples/declarative/declarative.pro @@ -23,7 +23,8 @@ contains(QT_CONFIG, opengl): SUBDIRS += shadereffects # These examples contain no C++ and can simply be copied sources.files = \ cppextensions \ - xml + xml \ + declarative.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative INSTALLS += sources diff --git a/examples/declarative/imageelements/imageelements.pro b/examples/declarative/imageelements/imageelements.pro index 8aa99203..7c1d576a 100644 --- a/examples/declarative/imageelements/imageelements.pro +++ b/examples/declarative/imageelements/imageelements.pro @@ -4,3 +4,8 @@ SUBDIRS += \ borderimage \ image \ shadows + +# install +sources.files = imageelements.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/imageelements +INSTALLS += sources diff --git a/examples/declarative/modelviews/gridview/gridview.pro b/examples/declarative/modelviews/gridview/gridview.pro index 5ff68def..6d7ffc37 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]/qtquick1/declarative/modelviews/gridview-example +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/gridview exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/listview/listview.pro b/examples/declarative/modelviews/listview/listview.pro index 877eb7cd..fa7def33 100644 --- a/examples/declarative/modelviews/listview/listview.pro +++ b/examples/declarative/modelviews/listview/listview.pro @@ -6,3 +6,8 @@ SUBDIRS += \ highlight \ highlightranges \ sections + +# install +sources.files = listview.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview +INSTALLS += sources diff --git a/examples/declarative/modelviews/modelviews.pro b/examples/declarative/modelviews/modelviews.pro index c50dd742..ee05704c 100644 --- a/examples/declarative/modelviews/modelviews.pro +++ b/examples/declarative/modelviews/modelviews.pro @@ -10,3 +10,8 @@ SUBDIRS += \ pathview \ stringlistmodel \ visualitemmodel + +# install +sources.files = modelviews.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews +INSTALLS += sources diff --git a/examples/declarative/modelviews/pathview/pathview.pro b/examples/declarative/modelviews/pathview/pathview.pro index 9b00ce2c..e88bbc67 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]/qtquick1/declarative/modelviews/pathview-example +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/pathview exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/text/fonts/fonts.pro b/examples/declarative/text/fonts/fonts.pro index 2359918e..33637ef4 100644 --- a/examples/declarative/text/fonts/fonts.pro +++ b/examples/declarative/text/fonts/fonts.pro @@ -5,3 +5,8 @@ SUBDIRS += \ banner \ fonts \ hello + +# install +sources.files = fonts.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text/fonts +INSTALLS += sources diff --git a/examples/declarative/text/text.pro b/examples/declarative/text/text.pro index 4e86deb3..755e811a 100644 --- a/examples/declarative/text/text.pro +++ b/examples/declarative/text/text.pro @@ -3,3 +3,8 @@ TEMPLATE = subdirs SUBDIRS += \ fonts \ textselection + +# install +sources.files = text.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text +INSTALLS += sources diff --git a/examples/declarative/threading/threading.pro b/examples/declarative/threading/threading.pro index 56508617..d281a764 100644 --- a/examples/declarative/threading/threading.pro +++ b/examples/declarative/threading/threading.pro @@ -3,3 +3,8 @@ TEMPLATE = subdirs SUBDIRS = \ threadedlistmodel \ workerscript + +# install +sources.files = threading.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/threading +INSTALLS += sources diff --git a/examples/declarative/touchinteraction/touchinteraction.pro b/examples/declarative/touchinteraction/touchinteraction.pro index 1228f141..1db70571 100644 --- a/examples/declarative/touchinteraction/touchinteraction.pro +++ b/examples/declarative/touchinteraction/touchinteraction.pro @@ -2,3 +2,8 @@ TEMPLATE = subdirs SUBDIRS = gestures/experimental-gestures/experimentalgestures.pro \ mousearea/mousearea-example/mouseareaexample.pro \ pincharea + +# install +sources.files = touchinteraction.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/touchinteraction +INSTALLS += sources diff --git a/examples/declarative/toys/toys.pro b/examples/declarative/toys/toys.pro index b24559a5..2e35b44a 100644 --- a/examples/declarative/toys/toys.pro +++ b/examples/declarative/toys/toys.pro @@ -6,3 +6,8 @@ SUBDIRS += \ dynamicscene \ tic-tac-toe/tictactoe.pro \ tvtennis + +# install +sources.files = toys.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/toys +INSTALLS += sources diff --git a/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro b/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro index f978c7bb..74ef3b66 100644 --- a/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro +++ b/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro @@ -3,3 +3,9 @@ QT += widgets declarative HEADERS += piechart.h SOURCES += piechart.cpp \ main.cpp + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/tutorials/extending/chapter1-basics +sources.files = $$SOURCES $$HEADERS app.qml chapter1-basics.pro +sources.path = $$[QT_INSTALL_EXAMPLES]//qtquick1/declarative/tutorials/extending/chapter1-basics +INSTALLS += target sources diff --git a/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro b/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro index f978c7bb..05b8e7dd 100644 --- a/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro +++ b/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro @@ -3,3 +3,9 @@ QT += widgets declarative HEADERS += piechart.h SOURCES += piechart.cpp \ main.cpp + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/tutorials/extending/chapter2-methods +sources.files = $$SOURCES $$HEADERS app.qml chapter2-methods.pro +sources.path = $$[QT_INSTALL_EXAMPLES]//qtquick1/declarative/tutorials/extending/chapter2-methods +INSTALLS += target sources diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro b/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro index f978c7bb..66a59503 100644 --- a/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro +++ b/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro @@ -3,3 +3,9 @@ QT += widgets declarative HEADERS += piechart.h SOURCES += piechart.cpp \ main.cpp + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/tutorials/extending/chapter3-bindings +sources.files = $$SOURCES $$HEADERS app.qml chapter3-bindings.pro +sources.path = $$[QT_INSTALL_EXAMPLES]//qtquick1/declarative/tutorials/extending/chapter3-bindings +INSTALLS += target sources diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro index b0c94cc7..50583372 100644 --- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro +++ b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro @@ -5,3 +5,9 @@ HEADERS += piechart.h \ SOURCES += piechart.cpp \ pieslice.cpp \ main.cpp + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/tutorials/extending/chapter4-customPropertyTypes +sources.files = $$SOURCES $$HEADERS app.qml chapter4-customPropertyTypes.pro +sources.path = $$[QT_INSTALL_EXAMPLES]//qtquick1/declarative/tutorials/extending/chapter4-customPropertyTypes +INSTALLS += target sources diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro b/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro index b0c94cc7..e76d3807 100644 --- a/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro +++ b/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro @@ -5,3 +5,9 @@ HEADERS += piechart.h \ SOURCES += piechart.cpp \ pieslice.cpp \ main.cpp + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/tutorials/extending/chapter5-listproperties +sources.files = $$SOURCES $$HEADERS app.qml chapter5-listproperties.pro +sources.path = $$[QT_INSTALL_EXAMPLES]//qtquick1/declarative/tutorials/extending/chapter5-listproperties +INSTALLS += target sources diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro index 62c41a0f..f4013d5f 100644 --- a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro +++ b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro @@ -17,3 +17,9 @@ SOURCES += piechart.cpp \ OTHER_FILES += chartsplugin.json maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri) + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/tutorials/extending/chapter6-plugins +sources.files = $$SOURCES $$HEADERS $$OTHER_FILES app.qml chapter6-plugins.pro +sources.path = $$[QT_INSTALL_EXAMPLES]//qtquick1/declarative/tutorials/extending/chapter6-plugins +INSTALLS += target sources diff --git a/examples/declarative/tutorials/extending/extending.pro b/examples/declarative/tutorials/extending/extending.pro index 967473fd..19bf40b9 100644 --- a/examples/declarative/tutorials/extending/extending.pro +++ b/examples/declarative/tutorials/extending/extending.pro @@ -8,3 +8,8 @@ SUBDIRS += \ chapter5-listproperties \ chapter6-plugins +# install +sources.files = extending.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/tutorials/extending +INSTALLS += sources + diff --git a/examples/declarative/tutorials/tutorials.pro b/examples/declarative/tutorials/tutorials.pro index 0a82c1e7..5ad5b37a 100644 --- a/examples/declarative/tutorials/tutorials.pro +++ b/examples/declarative/tutorials/tutorials.pro @@ -3,3 +3,7 @@ TEMPLATE = subdirs SUBDIRS += \ extending +# install +sources.files = tutorials.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/tutorials +INSTALLS += sources diff --git a/examples/declarative/ui-components/ui-components.pro b/examples/declarative/ui-components/ui-components.pro index 62d1cdf8..951121f3 100644 --- a/examples/declarative/ui-components/ui-components.pro +++ b/examples/declarative/ui-components/ui-components.pro @@ -9,3 +9,8 @@ SUBDIRS += dialcontrol \ slideswitch \ spinner \ tabwidget + +# install +sources.files = ui-components.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components +INSTALLS += sources |