summaryrefslogtreecommitdiffstats
path: root/examples/declarative/cppextensions/plugins
diff options
context:
space:
mode:
authorAndrew den Exter <andrew.den-exter@nokia.com>2012-08-02 12:38:27 +1000
committerQt by Nokia <qt-info@nokia.com>2012-08-03 06:06:29 +0200
commitb11e4cb8f57eabc32eb742b42f088898d96ec909 (patch)
tree82cbc453ba3547928773043f359f3f0a66bc0eeb /examples/declarative/cppextensions/plugins
parent680c98b04db6d5a49575782ba5bb58e06fa78bc2 (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/plugins')
-rw-r--r--examples/declarative/cppextensions/plugins/plugins.pro11
1 files changed, 3 insertions, 8 deletions
diff --git a/examples/declarative/cppextensions/plugins/plugins.pro b/examples/declarative/cppextensions/plugins/plugins.pro
index d04b24c3..a0f08844 100644
--- a/examples/declarative/cppextensions/plugins/plugins.pro
+++ b/examples/declarative/cppextensions/plugins/plugins.pro
@@ -17,16 +17,11 @@ qdeclarativesources.files += \
com/nokia/TimeExample/hour.png \
com/nokia/TimeExample/minute.png
-qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/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]/qtquick1/cppextensions/plugins
-target.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/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
-symbian {
- include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
- TARGET.EPOCALLOWDLLDATA = 1
-}
-maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri)