diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-11 16:34:58 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-11 17:04:04 +0200 |
commit | 1088aabe6ad770041f038d9eee9da11b9227d36e (patch) | |
tree | 693bf3350f113419564aed75e482741eb7e7336a /examples/quick/scenegraph/simplematerial | |
parent | 99eac6e3fb53dc1ca6f8136a02f93c33be3ef52f (diff) | |
parent | 2223f1ae293c2aedf4759564185f74b782395459 (diff) |
Merge branch 'release' into old/5.0old/5.0
Change-Id: I6e6f2ed367f89bab2114025478c873cfb132fe02
Diffstat (limited to 'examples/quick/scenegraph/simplematerial')
-rw-r--r-- | examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc b/examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc index 20d244fe99..730bbc7524 100644 --- a/examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc +++ b/examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example quick/scenegraph/simplematerial + \example scenegraph/simplematerial \title Simple Material Example \ingroup qtquickexamples \brief Shows how to define a scene graph material to fill a shape. |