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/touchinteraction/touchinteraction.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/touchinteraction/touchinteraction.pro')
-rw-r--r-- | examples/declarative/touchinteraction/touchinteraction.pro | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/examples/declarative/touchinteraction/touchinteraction.pro b/examples/declarative/touchinteraction/touchinteraction.pro index 1db70571..5ce0abe0 100644 --- a/examples/declarative/touchinteraction/touchinteraction.pro +++ b/examples/declarative/touchinteraction/touchinteraction.pro @@ -1,9 +1,4 @@ TEMPLATE = subdirs -SUBDIRS = gestures/experimental-gestures/experimentalgestures.pro \ - mousearea/mousearea-example/mouseareaexample.pro \ +SUBDIRS = gestures/experimental-gestures \ + mousearea/mousearea-example \ pincharea - -# install -sources.files = touchinteraction.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/touchinteraction -INSTALLS += sources |