diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2012-11-22 11:33:28 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-22 14:10:05 +0100 |
| commit | aba67cc3f020f03d8ed8ef5303d413044031bc58 (patch) | |
| tree | 7eedf57d46e6d1cb0223d8e6e455011cf914a0f1 /examples/quick/customitems | |
| parent | 8fc95e65e77328c995ef4a3a633a95c86f5e0bdf (diff) | |
Fix installation of examples.
Enable examples to be built in the target tree. This entails installing
the project files and possibly other missing stuff.
Task-number: QTBUG-27977
Change-Id: I159fd8e3ebc7077e1d68e085c4947acc058ce594
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'examples/quick/customitems')
| -rw-r--r-- | examples/quick/customitems/customitems.pro | 5 | ||||
| -rw-r--r-- | examples/quick/customitems/maskedmousearea/maskedmousearea.pro | 9 | ||||
| -rw-r--r-- | examples/quick/customitems/painteditem/painteditem.pro | 13 |
3 files changed, 16 insertions, 11 deletions
diff --git a/examples/quick/customitems/customitems.pro b/examples/quick/customitems/customitems.pro index 68a240cb5c..a401042d4e 100644 --- a/examples/quick/customitems/customitems.pro +++ b/examples/quick/customitems/customitems.pro @@ -10,3 +10,8 @@ SUBDIRS = \ #spinner \ #tabwidget \ maskedmousearea + +# install +sources.files = customitems.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/customitems +INSTALLS += sources diff --git a/examples/quick/customitems/maskedmousearea/maskedmousearea.pro b/examples/quick/customitems/maskedmousearea/maskedmousearea.pro index 654c3ceeb5..b812508bd7 100644 --- a/examples/quick/customitems/maskedmousearea/maskedmousearea.pro +++ b/examples/quick/customitems/maskedmousearea/maskedmousearea.pro @@ -7,8 +7,9 @@ HEADERS += maskedmousearea.h SOURCES += main.cpp \ maskedmousearea.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/maskedmousearea +target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/customitems/maskedmousearea qml.files = maskedmousearea.qml images -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/maskedmousearea -INSTALLS += target qml - +qml.path = $$target.path +sources.files = $$SOURCES $$HEADERS maskedmousearea.pro +sources.path = $$qml.path +INSTALLS += sources target qml diff --git a/examples/quick/customitems/painteditem/painteditem.pro b/examples/quick/customitems/painteditem/painteditem.pro index 59b0702547..846ad6307d 100644 --- a/examples/quick/customitems/painteditem/painteditem.pro +++ b/examples/quick/customitems/painteditem/painteditem.pro @@ -13,13 +13,12 @@ OTHER_FILES += textballoon.json DESTDIR = TextBalloonPlugin +INSTALL_PATH = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/customitems/painteditem/ qdeclarativesources.files += \ - TextBalloonPlugin/qmldir - -qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtquick/qml/painteditem/TextBalloonPlugin - -sources.files = textballoons.qml -sources.path += $$[QT_INSTALL_EXAMPLES]/qtquick/qml/painteditem -target.path += $$[QT_INSTALL_EXAMPLES]/qtquick/qml/painteditem/TextBalloonPlugin + TextBalloonPlugin/qmldir TextBalloonPlugin/plugin.h +qdeclarativesources.path += $$INSTALL_PATH/TextBalloonPlugin +sources.files = textballoons.qml $$SOURCES textballoon.h $$OTHER_FILES painteditem.pro +sources.path = $$INSTALL_PATH +target.path = $$INSTALL_PATH/TextBalloonPlugin INSTALLS = qdeclarativesources sources target |