summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-11-02 07:01:43 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-11-02 07:01:43 (GMT)
commit237ff8235191bdc06f0ef80d76c8f9a0934413b9 (patch)
treeb25eaa0b0bb0bb8abb26c8e73b25d8cb0e43a696
parent6f6db188a2579ad7ce04ecc7e5faeec943e4b5ce (diff)
downloadQt-237ff8235191bdc06f0ef80d76c8f9a0934413b9.zip
Qt-237ff8235191bdc06f0ef80d76c8f9a0934413b9.tar.gz
Qt-237ff8235191bdc06f0ef80d76c8f9a0934413b9.tar.bz2
Doc
-rw-r--r--doc/src/declarative/qmlreference.qdoc5
-rw-r--r--doc/src/declarative/tutorial3.qdoc2
-rw-r--r--src/declarative/util/qmlbind.cpp2
3 files changed, 1 insertions, 8 deletions
diff --git a/doc/src/declarative/qmlreference.qdoc b/doc/src/declarative/qmlreference.qdoc
index a56813c..f17e9d7 100644
--- a/doc/src/declarative/qmlreference.qdoc
+++ b/doc/src/declarative/qmlreference.qdoc
@@ -83,9 +83,4 @@
\list
\o \l {elements}{QML Elements}
\endlist
-
- \section1 Deprecated
- \list
- \o \l {tutorials-declarative-contacts.html}{Tutorial: 'Introduction to QML'}
- \endlist
*/
diff --git a/doc/src/declarative/tutorial3.qdoc b/doc/src/declarative/tutorial3.qdoc
index 1e67eee..290b535 100644
--- a/doc/src/declarative/tutorial3.qdoc
+++ b/doc/src/declarative/tutorial3.qdoc
@@ -38,7 +38,7 @@ This is equivalent to writing the two transitions separately.
The \l ParallelAnimation element makes sure that the two types of animations (number and color) start at the same time.
We could also run them one after the other by using \l SequentialAnimation instead.
-For more details on states and transitions, see \l {states-transitions}{States and Transitions}.
+For more details on states and transitions, see \l {QML States}.
[Previous: \l {Tutorial 2 - QML Component}] [\l {Tutorial}]
diff --git a/src/declarative/util/qmlbind.cpp b/src/declarative/util/qmlbind.cpp
index eadad08..de6d48a 100644
--- a/src/declarative/util/qmlbind.cpp
+++ b/src/declarative/util/qmlbind.cpp
@@ -85,8 +85,6 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Binding,QmlBind)
If the binding target or binding property is changed, the bound value is
immediately pushed onto the new target.
-
- \sa {qmlforcpp}{Qt Declarative Markup Language For C++ Programmers}
*/
/*!
\internal