summaryrefslogtreecommitdiffstats
path: root/examples/declarative/cppextensions/plugins
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@digia.com>2012-12-05 11:42:20 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-11 18:25:53 +0100
commit04cb8ef1ee919f071540ccb5cae10bb47f37fb3e (patch)
tree2e9aa7b3e908b00870d17a93023bd622fcd80c7a /examples/declarative/cppextensions/plugins
parent60c101b9907479e8bb6aa9770114572a72434dc6 (diff)
centralize and fixup example sources install targets
follow respective change in qtbase Change-Id: I15346e16cd1d6f30cf32a77284b5f19b1dd2a7a9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'examples/declarative/cppextensions/plugins')
-rw-r--r--examples/declarative/cppextensions/plugins/plugins.pro12
1 files changed, 5 insertions, 7 deletions
diff --git a/examples/declarative/cppextensions/plugins/plugins.pro b/examples/declarative/cppextensions/plugins/plugins.pro
index 053e6c44..93318e40 100644
--- a/examples/declarative/cppextensions/plugins/plugins.pro
+++ b/examples/declarative/cppextensions/plugins/plugins.pro
@@ -7,7 +7,7 @@ TARGET = qmlqtimeexampleplugin
SOURCES += plugin.cpp
-OTHER_FILES += "plugin.json"
+target.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins/com/nokia/TimeExample
qdeclarativesources.files += \
com/nokia/TimeExample/qmldir \
@@ -16,12 +16,10 @@ qdeclarativesources.files += \
com/nokia/TimeExample/Clock.qml \
com/nokia/TimeExample/hour.png \
com/nokia/TimeExample/minute.png
+qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins/com/nokia/TimeExample
-qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins/com/nokia/TimeExample
+qml.files += plugins.qml
+qml.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins
-sources.files += plugins.pro plugin.cpp plugins.qml README
-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
+INSTALLS += target qdeclarativesources qml