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/modelviews | |
| parent | be2cb6c919d3af82bf53e9c5a7e94c93268d893a (diff) | |
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/modelviews')
4 files changed, 12 insertions, 2 deletions
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() |