summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/doc.pri4
-rw-r--r--doc/src/declarative/positioners.qdoc32
-rw-r--r--doc/src/declarative/qdeclarativeintro.qdoc75
-rw-r--r--doc/src/declarative/qdeclarativemodels.qdoc4
-rw-r--r--doc/src/declarative/qmlinuse.qdoc28
-rw-r--r--doc/src/examples/svgalib.qdoc5
-rw-r--r--doc/src/getting-started/how-to-learn-qt.qdoc4
-rw-r--r--doc/src/getting-started/installation.qdoc11
-rw-r--r--doc/src/index.qdoc166
-rw-r--r--doc/src/internationalization/linguist-manual.qdoc2
-rw-r--r--doc/src/platforms/emb-accel.qdoc4
-rw-r--r--doc/src/platforms/emb-qvfb.qdoc1
-rw-r--r--doc/src/porting/porting4-modifiedvirtual.qdocinc2
-rw-r--r--doc/src/snippets/code/doc_src_lgpl.qdoc20
-rwxr-xr-xdoc/src/template/style/style.css34
-rw-r--r--doc/src/widgets-and-layouts/stylesheet.qdoc65
-rw-r--r--doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc4
17 files changed, 236 insertions, 225 deletions
diff --git a/doc/doc.pri b/doc/doc.pri
index a5db3c7..3cdac61 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -19,8 +19,8 @@ $$unixstyle {
QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && set QT_BUILD_TREE=$$QT_BUILD_TREE&& set QT_SOURCE_TREE=$$QT_SOURCE_TREE&& $$QT_BUILD_TREE/bin/qdoc3.exe $$DOCS_GENERATION_DEFINES
QDOC = $$replace(QDOC, "/", "\\")
}
-ADP_DOCS_QDOCCONF_FILE = -online qt-build-docs.qdocconf
-QT_DOCUMENTATION = ($$QDOC -creator qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \
+ADP_DOCS_QDOCCONF_FILE = qt-build-docs-online.qdocconf
+QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \
linguist.qdocconf qmake.qdocconf qdeclarative.qdocconf) && \
(cd $$QT_BUILD_TREE && \
$$GENERATOR doc-build/html-qt/qt.qhp -o doc/qch/qt.qch && \
diff --git a/doc/src/declarative/positioners.qdoc b/doc/src/declarative/positioners.qdoc
index 9265732..d97acbd 100644
--- a/doc/src/declarative/positioners.qdoc
+++ b/doc/src/declarative/positioners.qdoc
@@ -53,9 +53,9 @@ graphical elements:
\section2 Column
-\beginfloatright
-\image qml-column.png
-\endfloat
+\div{float-right}
+\inlineimage qml-column.png
+\enddiv
\l Column items are used to vertically arrange items. The following example
uses a Column item to arrange three \l Rectangle items in an area defined
@@ -70,9 +70,9 @@ must be added to a parent Rectangle, if desired.
\section2 Row
-\beginfloatright
-\image qml-row.png
-\endfloat
+\div{float-right}
+\inlineimage qml-row.png
+\enddiv
\l Row items are used to horizontally arrange items. The following example
uses a Row item to arrange three rounded \l Rectangle items in an area defined
@@ -87,9 +87,9 @@ left around the edges of the horizontally centered Row item.
\section2 Grid
-\beginfloatright
-\image qml-grid-spacing.png
-\endfloat
+\div{float-right}
+\inlineimage qml-grid-spacing.png
+\enddiv
\l Grid items are used to place items in a grid or table arrangement.
The following example uses a Grid item to place four \l Rectangle items
@@ -108,10 +108,10 @@ at the appropriate places in the Grid definition.
\section2 Flow
-\beginfloatright
-\image qml-flow-text1.png
-\image qml-flow-text2.png
-\endfloat
+\div{float-right}
+\inlineimage qml-flow-text1.png
+\inlineimage qml-flow-text2.png
+\enddiv
\l Flow items are used to place items like words on a page, with rows or
columns of non-overlapping items.
@@ -137,9 +137,9 @@ control of spacing between items and between lines of items.
\section1 Repeaters
-\beginfloatright
-\image qml-repeater-grid-index.png
-\endfloat
+\div{float-right}
+\inlineimage qml-repeater-grid-index.png
+\enddiv
Repeaters create items from a template for use with positioners, using data
from a model. Combining repeaters and positioners is an easy way to lay out
diff --git a/doc/src/declarative/qdeclarativeintro.qdoc b/doc/src/declarative/qdeclarativeintro.qdoc
index 4e41fda..299ec73 100644
--- a/doc/src/declarative/qdeclarativeintro.qdoc
+++ b/doc/src/declarative/qdeclarativeintro.qdoc
@@ -45,7 +45,7 @@ technologies like HTML and CSS, but it's not required.
QML looks like this:
-\code
+\qml
import QtQuick 1.0
Rectangle {
@@ -58,7 +58,7 @@ Rectangle {
anchors.centerIn: parent
}
}
-\endcode
+\endqml
Objects are specified by their type, followed by a pair of braces. Object
types always begin with a capital letter. In the above example, there are
@@ -71,18 +71,18 @@ value \c "pics/logo.png". The property and its value are separated by a colon.
Properties can be specified one-per-line:
-\code
+\qml
Rectangle {
width: 100
height: 100
}
-\endcode
+\endqml
or you can put multiple properties on a single line:
-\code
+\qml
Rectangle { width: 100; height: 100 }
-\endcode
+\endqml
When multiple property/value pairs are specified on a single line, they
must be separated by a semicolon.
@@ -96,17 +96,17 @@ and \l Image elements would not be available.
In addition to assigning values to properties, you can also assign
expressions written in JavaScript.
-\code
+\qml
Rotation {
angle: 360 * 3
}
-\endcode
+\endqml
These expressions can include references to other objects and properties, in which case
a \e binding is established: when the value of the expression changes, the property the
expression has been assigned to is automatically updated to that value.
-\code
+\qml
Item {
Text {
id: text1
@@ -117,7 +117,7 @@ Item {
text: text1.text
}
}
-\endcode
+\endqml
In the example above, the \c text2 object will display the same text as \c text1. If \c text1 is changed,
\c text2 is automatically changed to the same value.
@@ -142,12 +142,12 @@ your QML files.
Comments can also be used to prevent the execution of code, which is
sometimes useful for tracking down problems.
-\code
+\qml
Text {
text: "Hello world!"
//opacity: 0.5
}
-\endcode
+\endqml
In the above example, the Text object will have normal opacity, since the
line opacity: 0.5 has been turned into a comment.
@@ -164,14 +164,14 @@ Properties begin with a lowercase letter (with the exception of \l{Attached Prop
QML supports properties of many types (see \l{QML Basic Types}). The basic types include int,
real, bool, string, color, and lists.
-\code
+\qml
Item {
x: 10.5 // a 'real' property
- ...
+ // ...
state: "details" // a 'string' property
focus: true // a 'bool' property
}
-\endcode
+\endqml
QML properties are what is known as \e type-safe. That is, they only allow you to assign a value that
matches the property type. For example, the \c x property of item is a real, and if you try to assign
@@ -193,7 +193,7 @@ The first Rectangle element below has an \e id, "myRect". The second Rectangle e
own width by referring to \tt myRect.width, which means it will have the same \tt width
value as the first Rectangle element.
-\code
+\qml
Item {
Rectangle {
id: myRect
@@ -205,7 +205,7 @@ Item {
height: 200
}
}
-\endcode
+\endqml
Note that an \e id must begin with a lower-case letter or an underscore, and cannot contain characters other than letters, numbers and underscores.
@@ -214,24 +214,24 @@ Note that an \e id must begin with a lower-case letter or an underscore, and can
List properties look like this:
-\code
+\qml
Item {
children: [
Image {},
Text {}
]
}
-\endcode
+\endqml
The list is enclosed in square brackets, with a comma separating the
list elements. In cases where you are only assigning a single item to a
list, you can omit the square brackets:
-\code
+\qml
Image {
children: Rectangle {}
}
-\endcode
+\endqml
Items in the list can be accessed by index. See the \l{list}{list type} documentation
for more details about list properties and their available operations.
@@ -243,23 +243,23 @@ Each object type can specify one of its list or object properties as its default
If a property has been declared as the default property, the property tag can be omitted.
For example this code:
-\code
+\qml
State {
changes: [
PropertyChanges {},
PropertyChanges {}
]
}
-\endcode
+\endqml
can be simplified to:
-\code
+\qml
State {
PropertyChanges {}
PropertyChanges {}
}
-\endcode
+\endqml
because \c changes is the default property of the \c State type.
@@ -294,18 +294,7 @@ are of the form \e {Type.property} where \e Type is the type of the
element that attaches \e property.
For example:
-\code
-Component {
- id: myDelegate
- Text {
- text: "Hello"
- color: ListView.isCurrentItem ? "red" : "blue"
- }
-}
-ListView {
- delegate: myDelegate
-}
-\endcode
+\snippet doc/src/snippets/declarative/introduction-qml/attachedproperties1.qml component and list view
The \l ListView element attaches the \e ListView.isCurrentItem property
to each delegate it creates.
@@ -314,12 +303,12 @@ Another example of attached properties is the \l Keys element which
attaches properties for handling key presses to
any visual Item, for example:
-\code
+\qml
Item {
focus: true
Keys.onSelectPressed: console.log("Selected")
}
-\endcode
+\endqml
\section2 Signal Handlers
@@ -327,23 +316,23 @@ Signal handlers allow actions to be taken in response to an event. For instance
the \l MouseArea element has signal handlers to handle mouse press, release
and click:
-\code
+\qml
MouseArea {
onPressed: console.log("mouse button pressed")
}
-\endcode
+\endqml
All signal handlers begin with \e "on".
Some signal handlers include an optional parameter, for example
the MouseArea onPressed signal handler has a \e mouse parameter:
-\code
+\qml
MouseArea {
acceptedButtons: Qt.LeftButton | Qt.RightButton
onPressed: if (mouse.button == Qt.RightButton) console.log("Right mouse button pressed")
}
-\endcode
+\endqml
*/
diff --git a/doc/src/declarative/qdeclarativemodels.qdoc b/doc/src/declarative/qdeclarativemodels.qdoc
index e11cd56..495b3bd 100644
--- a/doc/src/declarative/qdeclarativemodels.qdoc
+++ b/doc/src/declarative/qdeclarativemodels.qdoc
@@ -504,9 +504,9 @@ a Web browser.
\l ListView shows a classic list of items with horizontal or vertical placing
of items.
-\beginfloatright
+\div{float-right}
\inlineimage qml-listview-snippet.png
-\endfloat
+\enddiv
The following example shows a minimal ListView displaying a sequence of
numbers (using an \l{QML Data Models#An Integer}{integer as a model}).
diff --git a/doc/src/declarative/qmlinuse.qdoc b/doc/src/declarative/qmlinuse.qdoc
index 1127b4c..a1be46c 100644
--- a/doc/src/declarative/qmlinuse.qdoc
+++ b/doc/src/declarative/qmlinuse.qdoc
@@ -72,7 +72,7 @@
</div>
<!-- tech domains start -->
<div class="item group">
- <hr>
+ <hr />
<div class="secondary">
<div class="box">
<!-- video box -->
@@ -100,7 +100,7 @@
</div>
<!-- next -->
<div class="item group">
- <hr>
+ <hr />
<div class="secondary">
<div class="box">
<!-- video box -->
@@ -140,7 +140,7 @@
</div>
<!-- next -->
<div class="item group">
- <hr>
+ <hr />
<div class="secondary">
<div class="box">
<!-- video box -->
@@ -185,7 +185,7 @@
</div>
<!-- next -->
<div class="item group">
- <hr>
+ <hr />
<div class="secondary">
<div class="box">
<!-- video box -->
@@ -198,7 +198,7 @@
<!-- video box end -->
</div>
<div class="primary">
- <h2><a name="interactElement">QML Interaction Elements</h2></a>
+ <h2><a name="interactElement">QML Interaction Elements</a></h2>
<p>
These elements define basic interactions such as touch movements and focus management.</p>
<b>Elements:</b>
@@ -216,7 +216,7 @@
</div>
<!-- next -->
<div class="item group">
- <hr>
+ <hr />
<div class="secondary">
<div class="box">
<!-- video box -->
@@ -243,7 +243,7 @@
</div>
<!-- next -->
<div class="item group">
- <hr>
+ <hr />
<div class="secondary">
<div class="box">
<!-- video box -->
@@ -276,7 +276,7 @@
</div>
<!-- next -->
<div class="item group">
- <hr>
+ <hr />
<div class="secondary">
<div class="box">
<!-- video box -->
@@ -307,7 +307,7 @@
</div>
<!-- next -->
<div class="item group">
- <hr>
+ <hr />
<div class="secondary">
<div class="box">
<!-- video box -->
@@ -334,7 +334,7 @@
</div>
<!-- next -->
<div class="item group">
- <hr>
+ <hr />
<div class="secondary">
<div class="box">
<!-- video box -->
@@ -372,7 +372,7 @@
</div>
<!-- next -->
<div class="item group">
- <hr>
+ <hr />
<div class="secondary">
<div class="box">
<!-- video box -->
@@ -410,7 +410,7 @@
</div>
<!-- next -->
<div class="item group">
- <hr>
+ <hr />
<div class="secondary">
<div class="box">
<!-- video box -->
@@ -441,7 +441,7 @@
</div>
<!-- next -->
<div class="item group">
- <hr>
+ <hr />
<div class="secondary">
<div class="box">
<!-- video box -->
@@ -468,7 +468,7 @@
</div>
<!-- next -->
<div class="item group">
- <hr>
+ <hr />
<div class="secondary">
<div class="box">
<!-- video box -->
diff --git a/doc/src/examples/svgalib.qdoc b/doc/src/examples/svgalib.qdoc
index 3e3e4d5..f733058 100644
--- a/doc/src/examples/svgalib.qdoc
+++ b/doc/src/examples/svgalib.qdoc
@@ -322,9 +322,8 @@
\snippet examples/qws/svgalib/svgalibsurface.h 0
We can implement most of the pure virtual functions inherited from
- QWSWindowSurface as trivial inline functions, except the
- \l {QWindowSurface::}{scroll()} function that actually makes use
- of some hardware acceleration:
+ QWSWindowSurface as trivial inline functions, except the scroll()
+ function that actually makes use of some hardware acceleration:
\snippet examples/qws/svgalib/svgalibsurface.cpp 0
diff --git a/doc/src/getting-started/how-to-learn-qt.qdoc b/doc/src/getting-started/how-to-learn-qt.qdoc
index e9f462c..0d5fd0a 100644
--- a/doc/src/getting-started/how-to-learn-qt.qdoc
+++ b/doc/src/getting-started/how-to-learn-qt.qdoc
@@ -51,9 +51,9 @@
key overviews to deepen your understanding of Qt: The Qt \l{Object
Model} and \l{Signals and Slots}.
- \beginfloatleft
+ \div{float-left}
\inlineimage qtdemo-small.png
- \endfloat
+ \enddiv
\section1 Getting an Overview
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index aa10aaf..f622192 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -1027,9 +1027,9 @@ We hope you will enjoy using Qt.
Qt from its source code, you will also need to install the development
packages for these libraries for your system.
- \table 90%
- \header \o Name \o Library \o Notes \o Configuration options \o Minimum working version
\raw HTML
+ <table class="generic">
+ <thead><tr class="qt-style topAlign"><th>Name</th><th>Library</th><th>Notes</th><th>Configuration options</th><th>Minimum working version
<tr id="OptionalColor">
<td> XRender </td><td> libXrender </td><td> X Rendering Extension; used for anti-aliasing</td>
<td><tt>-xrender</tt> or auto-detected</td><td>0.9.0</td>
@@ -1076,9 +1076,9 @@ We hope you will enjoy using Qt.
</tr><tr id="PthreadColor">
<td> pthread </td><td> libpthread </td><td> Multithreading</td>
<td></td><td>2.3.5</td>
- </tr>
+ </tr></th></tr></thead>
+ </table>
\endraw
- \endtable
\note You must compile with XRender support to get alpha transparency
support for pixmaps and images.
@@ -1166,8 +1166,9 @@ We hope you will enjoy using Qt.
{Windows Mobile 6 Professional/Standard}
\endlist
+ \bold{Note:}
\table
- \row \bold{Note:}
+ \row
\o
\list 1
\o Currently, there is only compile support for Windows CE 5.0
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 57fc18a..aefbea1 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -29,83 +29,91 @@
\page index.html
\keyword Qt Reference Documentation
- \raw HTML
- <div class="indexbox guide" >
- <div class="heading">
- Qt Developer Guide</div>
- <div class="indexboxcont indexboxbar">
- <div class="section indexIcon"><span></span></div>
- <div class="section">
- <p>Qt is a cross-platform application and UI framework. Using Qt, you can write web-enabled applications once and deploy them across desktop, mobile and embedded operating systems without rewriting the source code.</p>
- </div>
- <div class="section sectionlist">
- <ul>
- <li><a href="gettingstarted.html">Getting started</a></li>
- <li><a href="installation.html">Installation</a></li>
- <li><a href="how-to-learn-qt.html">How to learn Qt</a></li>
- <li><a href="tutorials.html">Tutorials</a></li>
- <li><a href="all-examples.html">Examples</a></li>
- <li><a href="qt4-7-intro.html">What's new in Qt 4.7</a></li>
- </ul>
- </div>
- </div>
- </div>
- <div class="indexbox api">
- <div class="heading">
- Qt API</div>
- <div class="indexboxcont indexboxbar ">
- <div class="sectionlist tricol">
- <ul>
- <li><a href="classes.html">All Classes</a></li>
- <li><a href="functions.html">All Functions</a></li>
- <li><a href="modules.html">All Modules</a></li>
- <li><a href="namespaces.html">All Namespaces</a></li>
- <li><a href="qtglobal.html">Global Declarations</a></li>
- <li><a href="licensing.html">Licenses and Credits</a></li>
- </ul>
- </div>
- <div class="sectionlist tricol">
- <ul>
- <li><a href="qt-basic-concepts.html">Programming with Qt</a></li>
- <li><a href="qt-gui-concepts.html">UI Design with Qt</a></li>
- <li><a href="developing-with-qt.html">Cross-platform and Platform-specific</a></li>
- <li><a href="technology-apis.html">Qt and Key Technologies</a></li>
- <li><a href="best-practices.html">Best Practices Guides</a></li>
- </ul>
- </div>
- <div class="sectionlist">
- <ul>
- <li><a href="qtquick.html">Qt Quick</a></li>
- <li><a href="qdeclarativeintroduction.html">Introduction to QML</a></li>
- <li><a href="qdeclarativeelements.html">QML Elements</a></li>
- <li><a href="qdeclarativeexamples.html">QML Examples and Demos</a></li>
- </ul>
- </div>
- </div>
- </div>
- <div class="indexbox tools">
- <div class="heading">
- Qt Tools</div>
- <div class="indexboxcont">
- <div class="section indexIcon"><span></span></div>
- <div class="section">
- <p>Qt offers a selection of development tools for different tasks. Use Qt Creator for
- project and code management as well as building powerfull UIs.</p>
- </div>
- <div class="section sectionlist">
- <ul>
- <li><a href="http://doc.qt.nokia.com/qtcreator-2.0/index.html">Qt Creator</a></li>
- <li><a href="designer-manual.html">Qt Designer</a></li>
- <li><a href="linguist-manual.html">Qt Linguist</a></li>
- <li><a href="assistant-manual.html">Qt Assistant</a></li>
- <li><a href="qmake-manual.html">Qt qmake</a></li>
- <li><a href="http://doc.qt.nokia.com/qtsimulator-1.0/index.html">Qt Simulator</a></li>
- <li><a href="http://qt.nokia.com/developer/eclipse-integration">Eclipse Integration</a></li>
- <li><a href="http://qt.nokia.com/products/appdev">Add-On Products and Services</a></li>
- <li><a href="qvfb.html">Virtual Framebuffer</a></li>
- </ul>
- </div>
- </div>
- </div>
- \endraw
+ \div {indexbox guide}
+ \div {heading}
+ Qt Developer Guide
+ \enddiv
+ \div {indexboxcont indexboxbar}
+ \div {section indexIcon} \emptyspan
+ \enddiv
+ \div {section}
+ Qt is a cross-platform application and UI
+ framework. Using Qt, you can write web-enabled
+ applications once and deploy them across desktop,
+ mobile and embedded operating systems without
+ rewriting the source code.
+ \enddiv
+ \div {section sectionlist}
+ \list
+ \o \l{Getting Started Guides}{Getting started}
+ \o \l{Installation}{Installation}
+ \o \l{how-to-learn-qt.html}{How to learn Qt}
+ \o \l{tutorials.html}{Tutorials}
+ \o \l{Qt Examples}{Examples}
+ \o \l{qt4-7-intro.html}{What's new in Qt 4.7}
+ \endlist
+ \enddiv
+ \enddiv
+ \enddiv
+ \div {indexbox api}
+ \div {heading}
+ Qt API
+ \enddiv
+ \div {indexboxcont indexboxbar }
+ \div {sectionlist tricol}
+ \list
+ \o \l{All Classes}{All Classes}
+ \o \l{All Functions}{All Functions}
+ \o \l{All Modules}{All Modules}
+ \o \l{All Namespaces}{All Namespaces}
+ \o \l{Global Qt Declarations}{Global Declarations}
+ \o \l{Qt Licenses and Credits}{Licenses and Credits}
+ \endlist
+ \enddiv
+ \div {sectionlist tricol}
+ \list
+ \o \l{qt-basic-concepts.html}{Programming with Qt}
+ \o \l{qt-gui-concepts.html}{UI Design with Qt}
+ \o \l{developing-with-qt.html}{Cross-platform and Platform-specific}
+ \o \l{technology-apis.html}{Qt and Key Technologies}
+ \o \l{best-practices.html}{Best Practices Guides}
+ \endlist
+ \enddiv
+ \div {sectionlist}
+ \list
+ \o \l{qtquick.html}{Qt Quick}
+ \o \l{qdeclarativeintroduction.html}{Introduction to QML}
+ \o \l{qdeclarativeelements.html}{QML Elements}
+ \o \l{qdeclarativeexamples.html}{QML Examples and Demos}
+ \endlist
+ \enddiv
+ \enddiv
+ \enddiv
+ \div {indexbox tools}
+ \div {heading}
+ Qt Tools
+ \enddiv
+ \div {indexboxcont}
+ \div {section indexIcon} \emptyspan
+ \enddiv
+ \div {section}
+ Qt offers a selection of development tools for
+ different tasks. Use Qt Creator for project and code
+ management as well as building powerfull UIs.
+ \enddiv
+ \div {section sectionlist}
+ \list
+ \o \l{http://doc.qt.nokia.com/qtcreator-2.0/index.html}{Qt Creator}
+ \o \l{designer-manual.html}{Qt Designer}
+ \o \l{linguist-manual.html}{Qt Linguist}
+ \o \l{assistant-manual.html}{Qt Assistant}
+ \o \l{qmake-manual.html}{Qt qmake}
+ \o \l{http://doc.qt.nokia.com/qtsimulator-1.0/index.html}{Qt Simulator}
+ \o \l{http://qt.nokia.com/developer/eclipse-integration}{Eclipse Integration}
+ \o \l{http://qt.nokia.com/products/appdev}{Add-On Products and Services}
+ \o \l{qvfb.html}{Virtual Framebuffer}
+ \endlist
+ \enddiv
+ \enddiv
+ \enddiv
*/
diff --git a/doc/src/internationalization/linguist-manual.qdoc b/doc/src/internationalization/linguist-manual.qdoc
index 57b98b8..baf37b0 100644
--- a/doc/src/internationalization/linguist-manual.qdoc
+++ b/doc/src/internationalization/linguist-manual.qdoc
@@ -95,7 +95,7 @@
\o A single phrase may need to be translated into several
different forms depending on context, e.g. \e open in English
- might become \e{\ouml\c{}ffnen}, "open file", or \e aufbauen,
+ might become \e{\ouml}\e{ffnen}, "open file", or \e aufbauen,
"open internet connection", in German.
\o Keyboard accelerators may need to be changed but without
diff --git a/doc/src/platforms/emb-accel.qdoc b/doc/src/platforms/emb-accel.qdoc
index c8854f7..77447de 100644
--- a/doc/src/platforms/emb-accel.qdoc
+++ b/doc/src/platforms/emb-accel.qdoc
@@ -117,8 +117,8 @@
\section1 Step 4: Make the Window Surface Aware of Your Paint Device
- Derive from the QWSWindowSurface class and reimplement its \l
- {QWSWindowSurface::}{paintDevice()} function. Make this function
+ Derive from the QWSWindowSurface class and reimplement its
+ paintDevice() function. Make this function
return a pointer to your custom raster paint device.
\section1 Step 5: Enable Creation of an Instance of Your Window Surface
diff --git a/doc/src/platforms/emb-qvfb.qdoc b/doc/src/platforms/emb-qvfb.qdoc
index 418d2d2..9993b3e 100644
--- a/doc/src/platforms/emb-qvfb.qdoc
+++ b/doc/src/platforms/emb-qvfb.qdoc
@@ -197,7 +197,6 @@
for the button are redrawn from the activated skin.
\row
- \row
\o
\image qt-embedded-clamshellphone-closed.png The ClamshellPhone Skin (closed)
\o
diff --git a/doc/src/porting/porting4-modifiedvirtual.qdocinc b/doc/src/porting/porting4-modifiedvirtual.qdocinc
index 1164238..332543f 100644
--- a/doc/src/porting/porting4-modifiedvirtual.qdocinc
+++ b/doc/src/porting/porting4-modifiedvirtual.qdocinc
@@ -10,7 +10,7 @@
\row \o bool QMacMime::canConvert(const char *, int) \o bool QMacMime::canConvert(const QString &, int)
\row \o QValueList<QByteArray> QMacMime::convertFromMime(QByteArray, const char *, int) \o QList<QByteArray> QMacMime::convertFromMime(QByteArray, const QString &, int)
\row \o QByteArray QMacMime::convertToMime(QValueList<QByteArray> data, const char *, int) \o QByteArray QMacMime::convertToMime(QList<QByteArray> data, const QString &, int)
-\row \o const char * QMacMime::convertorName() \o QString QMacMime::convertorName()
+\row \o const char * QMacMime::convertorName( ) \o QString QMacMime::convertorName( )
\row \o int QMacMime::flavorFor(const char *) \o int QMacMime::flavorFor(const QString &)
\row \o const char * QMacMime::mimeFor(int) \o QString QMacMime::mimeFor(int)
\row \o QMetaObject * QObject::metaObject() const \o const QMetaObject * QObject::metaObject() const
diff --git a/doc/src/snippets/code/doc_src_lgpl.qdoc b/doc/src/snippets/code/doc_src_lgpl.qdoc
index 8f21642..fa155fc 100644
--- a/doc/src/snippets/code/doc_src_lgpl.qdoc
+++ b/doc/src/snippets/code/doc_src_lgpl.qdoc
@@ -96,7 +96,7 @@ modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
-
+
Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
@@ -152,7 +152,7 @@ modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
-
+
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -199,7 +199,7 @@ Library.
You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.
-
+
2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
@@ -257,7 +257,7 @@ instead of to this License. (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
-
+
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
@@ -308,7 +308,7 @@ Library will still fall under Section 6.)
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
-
+
6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
@@ -370,7 +370,7 @@ restrictions of other proprietary libraries that do not normally
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
-
+
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
@@ -388,7 +388,7 @@ permitted, and provided that you do these two things:
where to find the accompanying uncombined form of the same work.
8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
+0the Library except as expressly provided under this License. Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License. However, parties who have received copies,
@@ -411,7 +411,7 @@ subject to these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
-
+
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
@@ -463,7 +463,7 @@ conditions either of that version or of any later version published by
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
-
+
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
@@ -497,7 +497,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
END OF TERMS AND CONDITIONS
-
+
How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 16bc9ed..d623bd4 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -176,15 +176,39 @@
{
/* background-color: #E6E6E6;*/ /* disabled until further notice */
}
-
+
+ div.float-left
+ {
+ float: left; margin-right: 2em
+ }
+ div.float-right
+ {
+ float: right; margin-left: 2em
+ }
+
span.comment
{
- color: #8B0000;
- font-style: italic;
+ color: #008B00;
}
span.string, span.char
{
- color: #254117;
+ color: #000084;
+ }
+ span.number
+ {
+ color: #a46200;
+ }
+ span.operator
+ {
+ color: black;
+ }
+ span.keyword
+ {
+ color: #840000;
+ }
+ span.name
+ {
+ color: black
}
@@ -266,7 +290,7 @@
color: #4c0033;
text-decoration: none;
}
- .content a:visited:hover
+ .content a:visited:hover
{
color: #4c0033;
text-decoration: underline;
diff --git a/doc/src/widgets-and-layouts/stylesheet.qdoc b/doc/src/widgets-and-layouts/stylesheet.qdoc
index 6343e6a..b35232e 100644
--- a/doc/src/widgets-and-layouts/stylesheet.qdoc
+++ b/doc/src/widgets-and-layouts/stylesheet.qdoc
@@ -1995,7 +1995,7 @@
\l{#bottom-prop}{bottom}.
\row
- \o \bold{\c lineedit-password- \BR \c character}* \target lineedit-password-character-prop
+ \o \bold{\c lineedit-password-character*} \target lineedit-password-character-prop
\o \l{#Number}{Number}
\o The QLineEdit password character as a Unicode number.
@@ -2091,8 +2091,7 @@
\row
- \o \bold{\c messagebox-text- \target messagebox-text-interaction-flags-prop
- \BR \c interaction-flags}*
+ \o \bold{\c messagebox-text-interaction-flags*} \target messagebox-text-interaction-flags-prop
\o \l{#Number}{Number}
\o The interaction behavior for text in a message box.
Possible values are based on Qt::TextInteractionFlags.
@@ -2153,7 +2152,7 @@
See also \l{#min-height-prop}{min-height}.
\row
- \o \bold{\c opacity}* \target opacity-prop
+ \o \bold{\c opacity*} \target opacity-prop
\o \l{#Number}{Number}
\o The opacity for a widget. Possible values are from 0
(transparent) to 255 (opaque). For the moment, this is
@@ -2249,7 +2248,7 @@
\l{#bottom-prop}{bottom}.
\row
- \o \bold{\c selection-background-color}* \target selection-background-color-prop
+ \o \bold{\c selection-background-color*} \target selection-background-color-prop
\o \l{#Brush}{Brush} \BR
\o The background of selected text or items.
@@ -2268,7 +2267,7 @@
\l{Qt Style Sheets Reference#background-prop}{background}.
\row
- \o \bold{\c selection-color}* \target selection-color-prop
+ \o \bold{\c selection-color*} \target selection-color-prop
\o \l{#Brush}{Brush} \BR
\o The foreground of selected text or items.
@@ -2288,8 +2287,7 @@
and \l{#color-prop}{color}.
\row
- \o \bold{\c show-decoration- \target show-decoration-selected-prop
- \BR \c selected}*
+ \o \bold{\c show-decoration-selected*} \target show-decoration-selected-prop
\o \l{#Boolean}{Boolean}
\o Controls whether selections in a QListView cover the
entire row or just the extent of the text.
@@ -2304,7 +2302,7 @@
\snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 73
\row
- \o \bold{\c spacing}* \target spacing-prop
+ \o \bold{\c spacing*} \target spacing-prop
\o \l{#Length}{Length}
\o Internal spacing in the widget.
@@ -2322,7 +2320,7 @@
\l{#margin-prop}{margin}.
\row
- \o \bold{\c subcontrol-origin}* \target subcontrol-origin-prop
+ \o \bold{\c subcontrol-origin*} \target subcontrol-origin-prop
\o \l{#Origin}{Origin}
\o The origin rectangle of the \l subcontrol within the
parent element.
@@ -2338,7 +2336,7 @@
\l{Qt Style Sheets Reference#subcontrol-position-prop}{subcontrol-position}.
\row
- \o \bold{\c subcontrol-position}* \target subcontrol-position-prop
+ \o \bold{\c subcontrol-position*} \target subcontrol-position-prop
\o \l{#Alignment}{Alignment}
\o The alignment of the \l subcontrol within the origin
rectangle specified by \l{Qt Style Sheets Reference#subcontrol-origin-prop}
@@ -2706,8 +2704,7 @@
\o Shorthand border property.
\row
- \o \bold{Border \target Border Image
- Image}
+ \o \bold{Border Image} \target Border Image
\o \c none \BR
| \l{Url} \l{Number}\{4\} \BR (\c stretch | \c repeat){0,2}
\o A border image is an image that is composed of nine parts
@@ -2723,8 +2720,7 @@
{CSS3 Draft Specification} for details.
\row
- \o \bold{Border \target Border Style
- Style}
+ \o \bold{Border Style} \target Border Style
\o \c dashed \BR
| \c dot-dash \BR
| \c dot-dot-dash \BR
@@ -2741,8 +2737,7 @@
{CSS3 Draft Specification} for details.
\row
- \o \bold{Box \target Box Colors
- Colors}
+ \o \bold{Box Colors} \target Box Colors
\o \l{#Brush}{Brush}\{1,4\}
\o One to four occurrences of \l{#Brush}{Brush}, specifying the top,
right, bottom, and left edges of a box, respectively. If
@@ -2757,8 +2752,7 @@
\snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 82
\row
- \o \bold{Box \target Box Lengths
- Lengths}
+ \o \bold{Box Lengths} \target Box Lengths
\o \l{#Length}{Length}\{1,4\}
\o One to four occurrences of \l{#Length}{Length}, specifying the
top, right, bottom, and left edges of a box,
@@ -2773,14 +2767,14 @@
\snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 83
\row
- \o \bold Brush \target Brush
+ \o \bold{Brush} \target Brush
\o \l{#Color}{Color} \BR
| \l{Gradient} \BR
| \l{PaletteRole}
\o Specifies a Color or a Gradient or an entry in the Palette.
\row
- \o \bold Color \target Color
+ \o \bold{Color} \target Color
\o \tt{rgb(\e{r}, \e{g}, \e{b})} \BR
| \tt{rgba(\e{r}, \e{g}, \e{b}, \e{a})} \BR
| \tt{hsv(\e{h}, \e{s}, \e{v})} \BR
@@ -2803,27 +2797,24 @@
\l{http://www.w3.org/TR/CSS21/syndata.html#color-units}{here}.
\row
- \o \bold Font \target Font
+ \o \bold{Font} \target Font
\o (\l{#Font Style}{Font Style} | \l{#Font Weight}{Font Weight}){0,2} \l{#Font Size}{Font Size} String
\o Shorthand font property.
\row
- \o \bold{Font \target Font Size
- Size}
+ \o \bold{Font Size} \target Font Size
\o \l{Length}
\o The size of a font.
\row
- \o \bold{Font \target Font Style
- Style}
+ \o \bold{Font Style} \target Font Style
\o \c normal \BR
| \c italic \BR
| \c oblique
\o The style of a font.
\row
- \o \bold{Font \target Font Weight
- Weight}
+ \o \bold{Font Weight} \target Font Weight
\o \c normal \BR
| \c bold \BR
| \c 100 \BR
@@ -2833,7 +2824,7 @@
\o The weight of a font.
\row
- \o \bold Gradient \target Gradient
+ \o \bold{Gradient} \target Gradient
\o \c qlineargradient \BR
| \c qradialgradient \BR
| \c qconicalgradient
@@ -2863,7 +2854,7 @@
\snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 85
\row
- \o \bold Icon \target Icon
+ \o \bold{Icon} \target Icon
\o (\l{#Url}{Url} (\c disabled | \c active | \c normal | \c selected)?
(\c on | \c off)? )*
\o A list of url, QIcon::Mode and QIcon::State.
@@ -2872,7 +2863,7 @@
\snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 86
\row
- \o \bold Length \target Length
+ \o \bold{Length} \target Length
\o \l{#Number}{Number} (\c px | \c pt | \c em | \c ex)?
\o A number followed by a measurement unit. The CSS standard recommends
that user agents must
@@ -2890,13 +2881,13 @@
\endlist
\row
- \o \bold Number \target Number
+ \o \bold{Number} \target Number
\o A decimal integer or a real number
\o Examples: \c 0, \c 18, \c +127, \c -255, \c 12.34, \c -.5,
\c 0009.
\row
- \o \bold Origin \target Origin
+ \o \bold{Origin} \target Origin
\o \c margin \BR
| \c border \BR
| \c padding \BR
@@ -2916,7 +2907,7 @@
See also \l{The Box Model}.
\row
- \o \bold PaletteRole \target PaletteRole
+ \o \bold{PaletteRole} \target PaletteRole
\o \c alternate-base \BR
| \c base \BR
| \c bright-text \BR
@@ -2941,7 +2932,7 @@
\snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 87
\row
- \o \bold Radius \target Radius
+ \o \bold{Radius} \target Radius
\o \l{#Length}{Length}\{1, 2\}
\o One or two occurrences of \l{#Length}{Length}. If only one length is
specified, it is used as the radius of the quarter circle
@@ -2950,7 +2941,7 @@
ellipse, whereas the second length is the vertical radius.
\row
- \o \bold Repeat \target Repeat
+ \o \bold{Repeat} \target Repeat
\o \c repeat-x \BR
| \c repeat-y \BR
| \c repeat \BR
@@ -2965,7 +2956,7 @@
\endlist
\row
- \o \bold Url \target Url
+ \o \bold{Url} \target Url
\o \tt{url(\e{filename})}
\o \tt{\e{filename}} is the name of a file on the local disk
or stored using \l{the Qt Resource System}. Setting an
diff --git a/doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc b/doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc
index d942ee6..e74c84c 100644
--- a/doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc
+++ b/doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc
@@ -41,9 +41,9 @@
现在您已经编写了一些小型可用的应用程序，并对 Qt 编程有更加广泛的了解。您可以直接着手做自己的项目，但我们建议您阅读以下一些关键简介以加深您对 Qt 的了解：\l{Qt Object Model}Qt 对象模型}和\l{Signals and Slots}{信号和槽}。
- \beginfloatleft
+ \div {float-left}
\inlineimage qtdemo-small.png
- \endfloat
+ \enddiv
\section1 了解概况
generated by cgit v0.12 at 2025-01-17 08:36:37 (GMT)