diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-11-29 16:02:34 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-10 18:16:48 +0100 |
| commit | a6065d60f158ffad7a94877883af69731da94295 (patch) | |
| tree | 5657fd490fd8a3f9794a8c9bcc9f85cf24a095c1 /examples/quick/customitems | |
| parent | c18e04b2e61f174a4883f6884cf9a0712c5725e3 (diff) | |
centralize and fixup example sources install targets
follow respective change in qtbase
Change-Id: I27502eb7ebea973e19ec5f7c3ec0e2338556f6e0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Diffstat (limited to 'examples/quick/customitems')
| -rw-r--r-- | examples/quick/customitems/customitems.pro | 21 | ||||
| -rw-r--r-- | examples/quick/customitems/maskedmousearea/maskedmousearea.pro | 6 | ||||
| -rw-r--r-- | examples/quick/customitems/painteditem/painteditem.pro | 16 |
3 files changed, 17 insertions, 26 deletions
diff --git a/examples/quick/customitems/customitems.pro b/examples/quick/customitems/customitems.pro index a401042d4e..1e0a2aed49 100644 --- a/examples/quick/customitems/customitems.pro +++ b/examples/quick/customitems/customitems.pro @@ -1,17 +1,14 @@ TEMPLATE = subdirs SUBDIRS = \ - #dialcontrol \ - #flipable \ painteditem \ - #progressbar \ - #scrollbar \ - #searchbox \ - #slideswitch \ - #spinner \ - #tabwidget \ maskedmousearea -# install -sources.files = customitems.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/customitems -INSTALLS += sources +EXAMPLE_FILES = \ + dialcontrol \ + flipable \ + progressbar \ + scrollbar \ + searchbox \ + slideswitch \ + spinner \ + tabwidget diff --git a/examples/quick/customitems/maskedmousearea/maskedmousearea.pro b/examples/quick/customitems/maskedmousearea/maskedmousearea.pro index b812508bd7..d44fa59d08 100644 --- a/examples/quick/customitems/maskedmousearea/maskedmousearea.pro +++ b/examples/quick/customitems/maskedmousearea/maskedmousearea.pro @@ -7,9 +7,7 @@ HEADERS += maskedmousearea.h SOURCES += main.cpp \ maskedmousearea.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/customitems/maskedmousearea +target.path = $$[QT_INSTALL_EXAMPLES]/quick/customitems/maskedmousearea qml.files = maskedmousearea.qml images qml.path = $$target.path -sources.files = $$SOURCES $$HEADERS maskedmousearea.pro -sources.path = $$qml.path -INSTALLS += sources target qml +INSTALLS += target qml diff --git a/examples/quick/customitems/painteditem/painteditem.pro b/examples/quick/customitems/painteditem/painteditem.pro index 846ad6307d..dfe6f96923 100644 --- a/examples/quick/customitems/painteditem/painteditem.pro +++ b/examples/quick/customitems/painteditem/painteditem.pro @@ -9,16 +9,12 @@ HEADERS += TextBalloonPlugin/plugin.h \ SOURCES += textballoon.cpp -OTHER_FILES += textballoon.json - DESTDIR = TextBalloonPlugin -INSTALL_PATH = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/customitems/painteditem/ -qdeclarativesources.files += \ - 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 +target.path = $$[QT_INSTALL_EXAMPLES]/quick/customitems/painteditem/TextBalloonPlugin +qmldir.files = TextBalloonPlugin/qmldir +qmldir.path = $$[QT_INSTALL_EXAMPLES]/quick/customitems/painteditem/TextBalloonPlugin +qml.files = textballoons.qml +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/customitems/painteditem/ -INSTALLS = qdeclarativesources sources target +INSTALLS += qml qmldir target |