diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-23 19:44:27 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-23 19:44:27 (GMT) |
| commit | 67b3edc50ad6e574f777d9accebe0750fbe3ddf7 (patch) | |
| tree | d33f6a922416d4ba1e806e98ce418a28108b1c0c | |
| parent | d1b07c00bf5ca50b33607898eb0d3948f7a14403 (diff) | |
| parent | 5438dd0c9085fbc6e73c40106e2923b65e292458 (diff) | |
| download | Qt-67b3edc50ad6e574f777d9accebe0750fbe3ddf7.zip Qt-67b3edc50ad6e574f777d9accebe0750fbe3ddf7.tar.gz Qt-67b3edc50ad6e574f777d9accebe0750fbe3ddf7.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Fix build error: specifying full path to pro file is required here.
| -rw-r--r-- | examples/declarative/animation/animation.pro | 6 | ||||
| -rw-r--r-- | examples/declarative/touchinteraction/touchinteraction.pro | 4 | ||||
| -rw-r--r-- | examples/declarative/toys/toys.pro | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/examples/declarative/animation/animation.pro b/examples/declarative/animation/animation.pro index a71df66..eb66ff5 100644 --- a/examples/declarative/animation/animation.pro +++ b/examples/declarative/animation/animation.pro @@ -1,8 +1,8 @@ TEMPLATE = subdirs SUBDIRS += \ - basics/property-animation \ - basics/color-animation \ + basics/property-animation/propertyanimation.pro \ + basics/color-animation/coloranimation.pro \ easing \ - behaviors/behavior-example \ + behaviors/behavior-example/behaviorexample.pro \ states diff --git a/examples/declarative/touchinteraction/touchinteraction.pro b/examples/declarative/touchinteraction/touchinteraction.pro index 5ce0abe..1228f14 100644 --- a/examples/declarative/touchinteraction/touchinteraction.pro +++ b/examples/declarative/touchinteraction/touchinteraction.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs -SUBDIRS = gestures/experimental-gestures \ - mousearea/mousearea-example \ +SUBDIRS = gestures/experimental-gestures/experimentalgestures.pro \ + mousearea/mousearea-example/mouseareaexample.pro \ pincharea diff --git a/examples/declarative/toys/toys.pro b/examples/declarative/toys/toys.pro index 5c7f70b..b24559a 100644 --- a/examples/declarative/toys/toys.pro +++ b/examples/declarative/toys/toys.pro @@ -4,5 +4,5 @@ SUBDIRS += \ clocks \ corkboards \ dynamicscene \ - tic-tac-toe \ + tic-tac-toe/tictactoe.pro \ tvtennis |