summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-02-16 12:17:54 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-02-16 12:17:54 (GMT)
commit4c4fac4699a2942c134f51bf2f6f473f1657bab3 (patch)
treee741518b1c0728329bc7f5a8ca5789cfb905b085
parente5534b9ba700fa2b25fa63e181e2c5f82469875d (diff)
downloadQt-4c4fac4699a2942c134f51bf2f6f473f1657bab3.zip
Qt-4c4fac4699a2942c134f51bf2f6f473f1657bab3.tar.gz
Qt-4c4fac4699a2942c134f51bf2f6f473f1657bab3.tar.bz2
doc: Fixed some qdoc errors.
-rw-r--r--doc/src/declarative/example-slideswitch.qdoc2
-rw-r--r--doc/src/declarative/qmli18n.qdoc4
-rw-r--r--doc/src/internationalization/i18n.qdoc2
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsitem.cpp4
-rw-r--r--src/declarative/qml/qmlmoduleplugin.cpp2
-rw-r--r--src/declarative/util/qmlview.cpp4
-rw-r--r--src/declarative/util/qmlview.h2
-rw-r--r--src/gui/text/qtextdocument.cpp19
8 files changed, 27 insertions, 12 deletions
diff --git a/doc/src/declarative/example-slideswitch.qdoc b/doc/src/declarative/example-slideswitch.qdoc
index 41a8574..56870f7 100644
--- a/doc/src/declarative/example-slideswitch.qdoc
+++ b/doc/src/declarative/example-slideswitch.qdoc
@@ -121,7 +121,7 @@ states (\e on and \e off).
This second function is called when the knob is released and we want to make sure that the knob does not end up between states
(neither \e on nor \e off). If it is the case call the \c toggle() function otherwise we do nothing.
-For more information on scripts see \l{qmlecmascript.html}{JavaScript Blocks}.
+For more information on scripts see \l{qmljavascript.html}{JavaScript Blocks}.
\section2 Transition
\snippet examples/declarative/slideswitch/content/Switch.qml 7
diff --git a/doc/src/declarative/qmli18n.qdoc b/doc/src/declarative/qmli18n.qdoc
index 0c8b1d1..86e218d 100644
--- a/doc/src/declarative/qmli18n.qdoc
+++ b/doc/src/declarative/qmli18n.qdoc
@@ -85,8 +85,8 @@ Next we create a translation source file using lupdate:
lupdate hello.qml -ts hello.ts
\endcode
-Then we open \c hello.ts in \l {Linguist}, provide a translation
-and create the release file \c hello.qm.
+Then we open \c hello.ts in \l{Qt Linguist Manual} {Linguist}, provide
+a translation and create the release file \c hello.qm.
Finally, we can test the translation in qmlviewer:
\code
diff --git a/doc/src/internationalization/i18n.qdoc b/doc/src/internationalization/i18n.qdoc
index 1ca6ab3..d5f32e3 100644
--- a/doc/src/internationalization/i18n.qdoc
+++ b/doc/src/internationalization/i18n.qdoc
@@ -729,7 +729,7 @@
\section1 Further Reading
- \l{Qt Linguist Manual}, \l{Hello tr Example}, \l{Translation Rules for Plurals}
+ \l{Qt Linguist Manual}, \l{Hello tr() Example}, \l{Translation Rules for Plurals}
*/
/*!
diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.cpp b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
index 8973cb4..87bd4dc 100644
--- a/src/declarative/graphicsitems/qmlgraphicsitem.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
@@ -1426,6 +1426,10 @@ QmlGraphicsKeysAttached *QmlGraphicsKeysAttached::qmlAttachedProperties(QObject
\internal
*/
+/*! \fn void QmlGraphicsItem::transformOriginChanged(TransformOrigin)
+ \internal
+*/
+
/*!
\fn void QmlGraphicsItem::childrenChanged()
\internal
diff --git a/src/declarative/qml/qmlmoduleplugin.cpp b/src/declarative/qml/qmlmoduleplugin.cpp
index 2f2cb25..3ebb1ef 100644
--- a/src/declarative/qml/qmlmoduleplugin.cpp
+++ b/src/declarative/qml/qmlmoduleplugin.cpp
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
The plugin should register QML types with qmlRegisterType() when the
defineModule() method is called.
- \sa examples/declarative/plugins
+ See the example in \c{examples/declarative/plugins}.
*/
/*!
diff --git a/src/declarative/util/qmlview.cpp b/src/declarative/util/qmlview.cpp
index 690924f..768bc7e 100644
--- a/src/declarative/util/qmlview.cpp
+++ b/src/declarative/util/qmlview.cpp
@@ -394,6 +394,10 @@ void QmlView::continueExecute()
This signal is emitted when the qml loaded contains \a errors.
*/
+/*! \fn void QmlView::quit()
+ \internal
+ */
+
/*!
\internal
*/
diff --git a/src/declarative/util/qmlview.h b/src/declarative/util/qmlview.h
index f4f58fd..dda7103 100644
--- a/src/declarative/util/qmlview.h
+++ b/src/declarative/util/qmlview.h
@@ -90,7 +90,7 @@ Q_SIGNALS:
void initialSize(QSize size);
void sceneResized(QSize size);
void errors(const QList<QmlError> &error);
- void quit ();
+ void quit();
private Q_SLOTS:
void continueExecute();
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index 80931c9..e1cfa9c 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -435,16 +435,23 @@ void QTextDocument::redo(QTextCursor *cursor)
}
}
+/*! \enum QTextDocument::Stacks
+
+ \value UndoStack The undo stack.
+ \value RedoStack The redo stack.
+ \value UndoAndRedoStacks Both the undo and redo stacks.
+*/
+
/*!
\since 4.7
- Clears the specified stacks.
+ Clears the stacks specified by \a stacksToClear.
- This method clears any commands on the undo stack, the redo stack, or both (the
- default). If any commands got cleared, the appropriate signals
- (\a QTextDocument::undoAvailable or \a QTextDocument::redoAvailable) get
- emitted.
+ This method clears any commands on the undo stack, the redo stack,
+ or both (the default). If commands are cleared, the appropriate
+ signals are emitted, QTextDocument::undoAvailable() or
+ QTextDocument::redoAvailable().
- \sa QTextDocument::undoAvailable QTextDocument::redoAvailable
+ \sa QTextDocument::undoAvailable() QTextDocument::redoAvailable()
*/
void QTextDocument::clearUndoRedoStacks(Stacks stacksToClear)
{