summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/diagrams/dbus-examples.pngbin0 -> 19642 bytes
-rw-r--r--doc/src/examples/qxmlstreambookmarks.qdoc13
-rw-r--r--doc/src/frameworks-technologies/gestures.qdoc2
-rw-r--r--doc/src/getting-started/known-issues.qdoc31
-rw-r--r--doc/src/images/dbus-examples.pngbin0 -> 6181 bytes
-rw-r--r--doc/src/snippets/code/doc_src_qalgorithms.qdoc2
-rw-r--r--doc/src/xml-processing/xml-processing.qdoc14
7 files changed, 46 insertions, 16 deletions
diff --git a/doc/src/diagrams/dbus-examples.png b/doc/src/diagrams/dbus-examples.png
new file mode 100644
index 0000000..816a9ab
--- /dev/null
+++ b/doc/src/diagrams/dbus-examples.png
Binary files differ
diff --git a/doc/src/examples/qxmlstreambookmarks.qdoc b/doc/src/examples/qxmlstreambookmarks.qdoc
index def4c47..26964c4 100644
--- a/doc/src/examples/qxmlstreambookmarks.qdoc
+++ b/doc/src/examples/qxmlstreambookmarks.qdoc
@@ -106,19 +106,18 @@
of reading only takes place if the file is a valid XBEL 1.0 file.
Note that the XML input needs to be well-formed to be accepted by
QXmlStreamReader. Otherwise, the \l{QXmlStreamReader::raiseError()}
- {raiseError()} function is used to display an error message.
+ {raiseError()} function is used to display an error message. Since the
+ XBEL reader is only concerned with reading XML elements, it makes
+ extensive use of the \l{QXmlStreamReader::readNextStartElement()}
+ convenience function.
\snippet examples/xml/streambookmarks/xbelreader.cpp 1
- The \c readUnknownElement() function reads an unknown element. The
- Q_ASSERT() macro is used to provide a pre-condition for the function.
-
- \snippet examples/xml/streambookmarks/xbelreader.cpp 2
-
The \c readXBEL() function reads the name of a startElement and calls
the appropriate function to read it, depending on whether if its a
"folder", "bookmark" or "separator". Otherwise, it calls
- \c readUnknownElement().
+ \l{QXmlStreamReader::skipCurrentElement()}. The Q_ASSERT() macro is used
+ to provide a pre-condition for the function.
\snippet examples/xml/streambookmarks/xbelreader.cpp 3
diff --git a/doc/src/frameworks-technologies/gestures.qdoc b/doc/src/frameworks-technologies/gestures.qdoc
index 49a9ae3..316d74d 100644
--- a/doc/src/frameworks-technologies/gestures.qdoc
+++ b/doc/src/frameworks-technologies/gestures.qdoc
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://www.example.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/doc/src/getting-started/known-issues.qdoc b/doc/src/getting-started/known-issues.qdoc
index 0a94d86..41bdcdf 100644
--- a/doc/src/getting-started/known-issues.qdoc
+++ b/doc/src/getting-started/known-issues.qdoc
@@ -133,6 +133,7 @@
\endlist
+
\section2 Mac OS X Software Support
\list
@@ -140,4 +141,34 @@
window will cause it to flash. This behavior has been reported to Apple
(bug number 5827676).
\endlist
+
+
+ \section2 Installing source packages on Unix systems
+
+ \list
+ \o If you download a Zip source package, you will need to convert
+ Windows-style line endings (CR/LF) to Unix-style line-endings (LF) when
+ you uncompress the package. To do this, give the "-a" option when you
+ run the "unzip' command.
+
+ If you fail to supply the "-a" option when unzipping the package, you
+ will see the following error message when you attempt to execute the
+ configure command:
+ "bash: ./configure: /bin/sh^M: bad interpreter: No such file or directory"
+ \endlist
+
+
+ \section2 Running evaluation packages on Windows XP
+
+ \list
+ \o If running the qt-win-eval-%VERSION%-vs2008.exe package on a Windows XP
+ system, you may encounter the following error message:
+ "The application failed to start because the application configuration
+ is incorrect. Reinstalling the application may fix this problem.".
+
+ This error occurs because the version of the CRT component on the
+ system is incorrect. Visual Studio 2008 requires CRT90 while Windows
+ XP comes with CRT80. To solve this problem, please install the 2008 CRT
+ redistributable package from Microsoft.
+ \endlist
*/
diff --git a/doc/src/images/dbus-examples.png b/doc/src/images/dbus-examples.png
new file mode 100644
index 0000000..6768935
--- /dev/null
+++ b/doc/src/images/dbus-examples.png
Binary files differ
diff --git a/doc/src/snippets/code/doc_src_qalgorithms.qdoc b/doc/src/snippets/code/doc_src_qalgorithms.qdoc
index 69d943c..e2126dd 100644
--- a/doc/src/snippets/code/doc_src_qalgorithms.qdoc
+++ b/doc/src/snippets/code/doc_src_qalgorithms.qdoc
@@ -302,7 +302,7 @@ list.clear();
QList<int> list;
list << 33 << 12 << 68 << 6 << 12;
qSort(list.begin(), list.end(), qLess<int>());
-// list: [ 68, 33, 12, 12, 6 ]
+// list: [ 6, 12, 12, 33, 68 ]
//! [24]
diff --git a/doc/src/xml-processing/xml-processing.qdoc b/doc/src/xml-processing/xml-processing.qdoc
index 44c5450..6e48515 100644
--- a/doc/src/xml-processing/xml-processing.qdoc
+++ b/doc/src/xml-processing/xml-processing.qdoc
@@ -121,18 +121,18 @@
Before we can apply a namespace to element or attribute names we must
declare it.
- Namespaces are URIs like \e http://www.qtsoftware.com/fnord/book/. This
+ Namespaces are URIs like \e http://www.example.com/fnord/book/. This
does not mean that data must be available at this address; the URI is
simply used to provide a unique name.
We declare namespaces in the same way as attributes; strictly speaking
they \e are attributes. To make for example \e
- http://www.qtsoftware.com/fnord/ the document's default XML namespace \e
+ http://www.example.com/fnord/ the document's default XML namespace \e
xmlns we write
\snippet doc/src/snippets/code/doc_src_qtxml.qdoc 8
- To distinguish the \e http://www.qtsoftware.com/fnord/book/ namespace from
+ To distinguish the \e http://www.example.com/fnord/book/ namespace from
the default, we must supply it with a prefix:
\snippet doc/src/snippets/code/doc_src_qtxml.qdoc 9
@@ -159,12 +159,12 @@
\snippet doc/src/snippets/code/doc_src_qtxml.qdoc 10
Within the \e document element we have two namespaces declared. The
- default namespace \e http://www.qtsoftware.com/fnord/ applies to the \e
+ default namespace \e http://www.example.com/fnord/ applies to the \e
book element, the \e chapter element, the appropriate \e title element
and of course to \e document itself.
The \e book:author and \e book:title elements belong to the namespace
- with the URI \e http://www.qtsoftware.com/fnord/book/.
+ with the URI \e http://www.example.com/fnord/book/.
The two \e book:author attributes \e title and \e name have no XML
namespace assigned. They are only members of the "traditional"
@@ -172,7 +172,7 @@
\e title attributes in \e book:author are forbidden.
In the above example we circumvent the last rule by adding a \e title
- attribute from the \e http://www.qtsoftware.com/fnord/ namespace to \e
+ attribute from the \e http://www.example.com/fnord/ namespace to \e
book:author: the \e fnord:title comes from the namespace with the
prefix \e fnord that is declared in the \e book:author element.
@@ -212,7 +212,7 @@
local part of \e book:title.)
\o The \e {namespace URI} ("Uniform Resource Identifier") is a unique
identifier for a namespace. It looks like a URL
- (e.g. \e http://www.qtsoftware.com/fnord/ ) but does not require
+ (e.g. \e http://www.example.com/fnord/ ) but does not require
data to be accessible by the given protocol at the named address.
\endlist