diff options
| author | Daniel Molkentin <daniel.molkentin@nokia.com> | 2011-11-21 12:24:20 (GMT) |
|---|---|---|
| committer | Daniel Molkentin <daniel.molkentin@nokia.com> | 2011-11-21 12:50:57 (GMT) |
| commit | 0b594c27b946eb8c2356f1400e3dfb72be824588 (patch) | |
| tree | 627374251c5a14659fb8543ee98f46d46c761ebb /examples/declarative/cppextensions | |
| parent | 7eb8de4dde6df60b26e5297407573f01634415c3 (diff) | |
| download | Qt-0b594c27b946eb8c2356f1400e3dfb72be824588.zip Qt-0b594c27b946eb8c2356f1400e3dfb72be824588.tar.gz Qt-0b594c27b946eb8c2356f1400e3dfb72be824588.tar.bz2 | |
Fix use of qmlapplicationviewer.
- Two separate copies for demos and example
- Fix deployment (don't install to opt in desktop case)
Reviewed-by: Casper van Donderen
Diffstat (limited to 'examples/declarative/cppextensions')
3 files changed, 6 insertions, 3 deletions
diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro b/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro index 66ce4b1..5cc3660 100644 --- a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro +++ b/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro @@ -35,5 +35,6 @@ SOURCES += main.cpp RESOURCES += networkaccessmanagerfactory.qrc # Please do not modify the following two lines. Required for deployment. -include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri) +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/networkaccessmanagerfactory +include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro index 9dbca8f..0822a1d 100644 --- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro +++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro @@ -42,6 +42,7 @@ RESOURCES += \ gridlayout.qrc # Please do not modify the following two lines. Required for deployment. -include(../../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri) +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout +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 ca4232c..f8a4c97 100644 --- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro +++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro @@ -41,5 +41,6 @@ RESOURCES += \ linearlayout.qrc # Please do not modify the following two lines. Required for deployment. -include(../../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri) +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout +include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() |