diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-03 16:16:08 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-03 16:16:08 +0200 |
| commit | acc94a42cd9c31ac68e063edc1caada4251d12b0 (patch) | |
| tree | 19a4816cf3972b3d16235ed601788193fe0f20df /src/quick/doc/src/advtutorial.qdoc | |
| parent | 4c94a3ca55e82ade19ff5d4ab361d40e6252f2da (diff) | |
| parent | 2223f1ae293c2aedf4759564185f74b782395459 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Conflicts:
examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc
examples/quick/accessibility/doc/src/accessibility.qdoc
examples/quick/animation/doc/src/animation.qdoc
examples/quick/canvas/doc/src/canvas.qdoc
examples/quick/draganddrop/doc/src/draganddrop.qdoc
examples/quick/imageelements/doc/src/imageelements.qdoc
examples/quick/keyinteraction/doc/src/keyinteraction.qdoc
examples/quick/localstorage/doc/src/localstorage.qdoc
examples/quick/mousearea/doc/src/mousearea.qdoc
examples/quick/particles/affectors/doc/src/affectors.qdoc
examples/quick/particles/customparticle/doc/src/customparticle.qdoc
examples/quick/particles/emitters/doc/src/emitters.qdoc
examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc
examples/quick/particles/system/doc/src/system.qdoc
examples/quick/positioners/doc/src/positioners.qdoc
examples/quick/righttoleft/doc/src/righttoleft.qdoc
examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc
examples/quick/scenegraph/openglunderqml/doc/src/openglunderqml.qdoc
examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc
examples/quick/threading/doc/src/threading.qdoc
examples/quick/touchinteraction/doc/src/touchinteraction.qdoc
examples/quick/views/doc/src/views.qdoc
Change-Id: Idf7bb76c82acacf86b19a9f4633c3cbf4ae1a9a0
Diffstat (limited to 'src/quick/doc/src/advtutorial.qdoc')
| -rw-r--r-- | src/quick/doc/src/advtutorial.qdoc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/doc/src/advtutorial.qdoc b/src/quick/doc/src/advtutorial.qdoc index f670e3a323..966233c371 100644 --- a/src/quick/doc/src/advtutorial.qdoc +++ b/src/quick/doc/src/advtutorial.qdoc @@ -71,7 +71,7 @@ directory. \previouspage QML Advanced Tutorial \nextpage QML Advanced Tutorial 2 - Populating the Game Canvas -\example quick/tutorials/samegame/samegame1 +\example tutorials/samegame/samegame1 \section2 Creating the application screen @@ -141,7 +141,7 @@ types to get started. Next, we will populate the game canvas with some blocks. \previouspage QML Advanced Tutorial 1 - Creating the Game Canvas and Blocks \nextpage QML Advanced Tutorial 3 - Implementing the Game Logic -\example quick/tutorials/samegame/samegame2 +\example tutorials/samegame/samegame2 \section2 Generating the blocks in JavaScript @@ -217,7 +217,7 @@ Now, we have a screen of blocks, and we can begin to add the game mechanics. \previouspage QML Advanced Tutorial 2 - Populating the Game Canvas \nextpage QML Advanced Tutorial 4 - Finishing Touches -\example quick/tutorials/samegame/samegame3 +\example tutorials/samegame/samegame3 \section2 Making a playable game @@ -305,7 +305,7 @@ until the next chapter - where your application becomes alive! \contentspage QML Advanced Tutorial \previouspage QML Advanced Tutorial 3 - Implementing the Game Logic -\example quick/tutorials/samegame/samegame4 +\example tutorials/samegame/samegame4 \section2 Adding some flair |