summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/src/declarative/example-slideswitch.qdoc2
-rw-r--r--doc/src/declarative/integrating.qdoc10
-rw-r--r--doc/src/declarative/qmli18n.qdoc4
-rw-r--r--doc/src/declarative/qmlintro.qdoc2
-rw-r--r--doc/src/internationalization/i18n.qdoc2
-rw-r--r--doc/src/xml-processing/xml-patterns.qdoc2
-rw-r--r--doc/src/xml-processing/xquery-introduction.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/kernel/qwidget_mac.mm2
-rw-r--r--src/gui/text/qtextdocument.cpp19
13 files changed, 38 insertions, 19 deletions
diff --git a/doc/src/declarative/example-slideswitch.qdoc b/doc/src/declarative/example-slideswitch.qdoc
index 41a6709..c731d4a 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/integrating.qdoc b/doc/src/declarative/integrating.qdoc
index 86c513e..b7f8b17 100644
--- a/doc/src/declarative/integrating.qdoc
+++ b/doc/src/declarative/integrating.qdoc
@@ -68,10 +68,12 @@ elements, and QML is a better choice if your UI is comprised of a large number
of simple and dynamic elements.
\section1 Adding QML to a QGraphicsView based UI
-If you have an existing Graphics View based UI you can create new items in QML,
-and use \l{QmlComponent} to create \l{QGraphicsObject}s from the QML files. These
-\l{QGraphicsObject}s can then be placed into your \l{QGraphicsScene} using \l{QGraphicsScene::addItem}
-or by reparenting them to an item already in the \l{QGraphicsScene}.
+
+If you have an existing Graphics View based UI you can create new
+items in QML, and use \l{QmlComponent} to create \l{QGraphicsObject}s
+from the QML files. These \l{QGraphicsObject}s can then be placed into
+your \l{QGraphicsScene} using \l{QGraphicsScene::addItem()} or by
+reparenting them to an item already in the \l{QGraphicsScene}.
Example, for local QML files:
diff --git a/doc/src/declarative/qmli18n.qdoc b/doc/src/declarative/qmli18n.qdoc
index 2471e7d..bc64ed7 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/declarative/qmlintro.qdoc b/doc/src/declarative/qmlintro.qdoc
index e229f0c..494c4c7 100644
--- a/doc/src/declarative/qmlintro.qdoc
+++ b/doc/src/declarative/qmlintro.qdoc
@@ -168,7 +168,7 @@ Properties begin with a lowercase letter (with the exception of \l{Attached Prop
\section2 Property types
-QML supports properties of many types (see \l{Common QML Types}). The basic types include int,
+QML supports properties of many types (see \l{QML Basic Types}). The basic types include int,
real, bool, string, color, and lists.
\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/doc/src/xml-processing/xml-patterns.qdoc b/doc/src/xml-processing/xml-patterns.qdoc
index 1a9f76d..408b2da 100644
--- a/doc/src/xml-processing/xml-patterns.qdoc
+++ b/doc/src/xml-processing/xml-patterns.qdoc
@@ -83,7 +83,7 @@
First, the query opens a \c{<bibliography>} element in the
output. The
- \l{xquery-introduction.html#using-path-expressions-to-match-select-items}
+ \l{xquery-introduction.html#using-path-expressions-to-match-and-select-items}
{embedded path expression} then loads the XML document describing
the contents of the library (\c{library.xml}) and begins the
search. For each \c{<book>} element it finds, where the publisher
diff --git a/doc/src/xml-processing/xquery-introduction.qdoc b/doc/src/xml-processing/xquery-introduction.qdoc
index 84e21ab..9306420 100644
--- a/doc/src/xml-processing/xquery-introduction.qdoc
+++ b/doc/src/xml-processing/xquery-introduction.qdoc
@@ -75,7 +75,7 @@ It creates a new \c{<html>} element in the output and sets its \c{id}
attribute to be the \c{id} attribute from an \c{<html>} element in the
\c{other.html} file.
-\section1 Using Path Expressions To Match & Select Items
+\section1 Using Path Expressions To Match And Select Items
In C++ and Java, we write nested \c{for} loops and recursive functions
to traverse XML trees in search of elements of interest. In XQuery, we
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/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
index 0ce369d..9e642b9 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/kernel/qwidget_mac.mm
@@ -3348,6 +3348,8 @@ void QWidgetPrivate::show_sys()
bool realWindow = isRealWindow();
#ifndef QT_MAC_USE_COCOA
if (realWindow && !q->testAttribute(Qt::WA_Moved)) {
+ if (qt_mac_is_macsheet(q))
+ recreateMacWindow();
q->createWinId();
if (QWidget *p = q->parentWidget()) {
p->createWinId();
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)
{
generated by cgit v0.12 at 2024-10-22 04:34:52 (GMT)