diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-08-02 12:38:27 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-03 06:06:29 +0200 |
| commit | b11e4cb8f57eabc32eb742b42f088898d96ec909 (patch) | |
| tree | 82cbc453ba3547928773043f359f3f0a66bc0eeb /examples/declarative/cppextensions/imageprovider | |
| parent | 680c98b04db6d5a49575782ba5bb58e06fa78bc2 (diff) | |
Fix install paths of demos and examples.
Install all demos and examples to the qtquick1 subdirectory of
the examples install location, demos under a demos folder,
declarative examples under a declarative folder and the common
viewer code under a helper folder.
This mirrors the directory structure of the src directory and
ensures the examples sources can be built from the install
location.
Task-number: QTBUG-26663
Change-Id: I406f4fa58e5f004eb1aef5902fa2d6267517943d
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'examples/declarative/cppextensions/imageprovider')
| -rw-r--r-- | examples/declarative/cppextensions/imageprovider/imageprovider.pro | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro index fcb9149d..0d9b33c9 100644 --- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro +++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro @@ -10,22 +10,13 @@ SOURCES += imageprovider.cpp OTHER_FILES += imageprovider.json sources.files = $$SOURCES imageprovider.qml imageprovider.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/imageprovider +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/imageprovider -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/imageprovider/ImageProviderCore +target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/imageprovider/ImageProviderCore ImageProviderCore_sources.files = \ ImageProviderCore/qmldir -ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/imageprovider/ImageProviderCore +ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/imageprovider/ImageProviderCore INSTALLS = sources ImageProviderCore_sources target -symbian:{ - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - TARGET.EPOCALLOWDLLDATA = 1 - - importFiles.files = ImageProviderCore/qmlimageproviderplugin.dll ImageProviderCore/qmldir - importFiles.path = ImageProviderCore - DEPLOYMENT += importFiles -} -maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri) |