diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-09 12:15:59 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 12:44:43 +0100 |
| commit | 3146dcbdc768c90a03b58eed3f42630604443093 (patch) | |
| tree | 10e234460c5f57012b346cdbe6304002ad0a446d /examples/declarative/cppextensions/imageprovider/imageprovider.pro | |
| parent | a7ea2afffd61e2a89f7bb2c586b4b733c4996bb5 (diff) | |
| parent | 722725cf24e45e86a2844810b90787a29df8a4a9 (diff) | |
Merge branch 'stable' into dev
Conflicts:
sync.profile
tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
Change-Id: I3620d15b4163fec420d18f6be50cae1635b99a2f
Diffstat (limited to 'examples/declarative/cppextensions/imageprovider/imageprovider.pro')
| -rw-r--r-- | examples/declarative/cppextensions/imageprovider/imageprovider.pro | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro index 9e698d88..66beb308 100644 --- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro +++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro @@ -1,5 +1,5 @@ TEMPLATE = lib -CONFIG += qt plugin +CONFIG += plugin QT += declarative DESTDIR = ImageProviderCore @@ -7,16 +7,11 @@ TARGET = qmlimageproviderplugin SOURCES += imageprovider.cpp -OTHER_FILES += imageprovider.json +target.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/imageprovider/ImageProviderCore +qml.files = imageprovider-example.qml +qml.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/imageprovider +qml2.files = ImageProviderCore/qmldir +qml2.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/imageprovider/ImageProviderCore -sources.files = $$SOURCES imageprovider.qml imageprovider.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/imageprovider - -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/imageprovider/ImageProviderCore - -ImageProviderCore_sources.files = \ - ImageProviderCore/qmldir -ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/imageprovider/ImageProviderCore - -INSTALLS = sources ImageProviderCore_sources target +INSTALLS = qml qml2 target |