From 1eea6ca3c22a1c859d06b573570314f7bd2f2833 Mon Sep 17 00:00:00 2001
From: Sergio Ahumada <sergio.ahumada@nokia.com>
Date: Mon, 31 Jan 2011 23:36:54 +0100
Subject: Doc: Fixing typo
---
tools/qdoc3/ditaxmlgenerator.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp
index 44df302..e180c0a 100644
--- a/tools/qdoc3/ditaxmlgenerator.cpp
+++ b/tools/qdoc3/ditaxmlgenerator.cpp
@@ -2285,7 +2285,7 @@ void DitaXmlGenerator::generateIncludes(const InnerNode* inner, CodeMarker* mark
/*!
zzz
- Generates a table of contents begining at \a node.
+ Generates a table of contents beginning at \a node.
Currently just returns without writing anything.
*/
void DitaXmlGenerator::generateTableOfContents(const Node* node,
--
cgit v0.12
From 3cd70e43edb3458bae05a3e9c90b007ae2cb82b5 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Tue, 1 Feb 2011 13:43:00 +0100
Subject: Doc: Updated the copyright statements in the templates.
---
tools/qdoc3/test/qt-html-templates-online.qdocconf | 2 +-
tools/qdoc3/test/qt-html-templates.qdocconf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/qdoc3/test/qt-html-templates-online.qdocconf b/tools/qdoc3/test/qt-html-templates-online.qdocconf
index bc7dbd2..dc84e7d 100644
--- a/tools/qdoc3/test/qt-html-templates-online.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates-online.qdocconf
@@ -155,7 +155,7 @@ HTML.footer = \
" </div> \n" \
" <div class=\"footer\">\n" \
" <p>\n" \
- " <acronym title=\"Copyright\">©</acronym> 2008-2010 Nokia Corporation and/or its\n" \
+ " <acronym title=\"Copyright\">©</acronym> 2008-2011 Nokia Corporation and/or its\n" \
" subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
" in Finland and/or other countries worldwide.</p>\n" \
" <p>\n" \
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index e2d2b4a..6f756da 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -23,7 +23,7 @@ HTML.footer = \
"</div> \n" \
"<div class=\"footer\">\n" \
" <p>\n" \
- " <acronym title=\"Copyright\">©</acronym> 2008-2010 Nokia Corporation and/or its\n" \
+ " <acronym title=\"Copyright\">©</acronym> 2008-2011 Nokia Corporation and/or its\n" \
" subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
" in Finland and/or other countries worldwide.</p>\n" \
" <p>\n" \
--
cgit v0.12
From 9880d5dfef94c47d3d3ed18566bff58a800d4d25 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Tue, 1 Feb 2011 17:52:29 +0100
Subject: Doc: Fixed broken links to the old Symbian Foundation Wiki.
Task-number: QTBUG-17058
---
doc/src/deployment/deployment.qdoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc
index 4817058..bc80ed3 100644
--- a/doc/src/deployment/deployment.qdoc
+++ b/doc/src/deployment/deployment.qdoc
@@ -1550,8 +1550,8 @@
\note If you want to have your application properly Symbian Signed for distribution,
you will have to properly sign both the application and the application installer packages.
Please see
- \l{http://developer.symbian.org/wiki/index.php/Category:Symbian_Signed}
- {Symbian Signed wiki} for more information about Symbian Signed.
+ \l{http://wiki.forum.nokia.com/index.php/Category:Symbian_Signed}
+ {Forum Nokia Wiki} for more information about Symbian Signed.
For more information about creating a \c .sis file and installing it to device see also
\l {The Symbian platform - Introduction to Qt#Installing your own applications}{here}.
--
cgit v0.12
From 35a849e4e36ac6494233dc8307c4eac0c7fdf889 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Tue, 1 Feb 2011 17:55:44 +0100
Subject: Doc: Removed unnecessary HTML entity from the title.
---
doc/src/howtos/HWacceleration.qdoc | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/doc/src/howtos/HWacceleration.qdoc b/doc/src/howtos/HWacceleration.qdoc
index b5a4733..0dc5d5e 100644
--- a/doc/src/howtos/HWacceleration.qdoc
+++ b/doc/src/howtos/HWacceleration.qdoc
@@ -27,7 +27,7 @@
/*!
\page HWAcc_rendering.html
- \title Hardware Acceleration & Embedded Platforms.
+ \title Hardware Acceleration and Embedded Platforms.
\brief How to use hardware acceleration for fast rendering.
\ingroup best-practices
@@ -45,11 +45,11 @@
\input platforms/emb-hardwareacceleration.qdocinc
\section1 Supported platforms
- Since there might be differences to how the APIs are being used on
- the different embedded platforms, this table provides you with links to
- pages dedicated to platform specific documentation for each
- supported hardware acceleration API. Click the API link for the
- platform to go the correct documentation.
+ Since there might be differences to how the APIs are being used on
+ the different embedded platforms, this table provides you with links to
+ pages dedicated to platform specific documentation for each
+ supported hardware acceleration API. Click the API link for the
+ platform to go the correct documentation.
\table
\header
--
cgit v0.12
From eebe205b306daaa3674d9746de11a73bef4bd0de Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Tue, 1 Feb 2011 17:56:30 +0100
Subject: Doc: Fixed QML, unindented snippet.
---
.../webkit/WebKit/qt/declarative/qdeclarativewebview.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp
index 7a8aae7..4238d33 100644
--- a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp
@@ -742,11 +742,11 @@ QWebPage* QDeclarativeWebView::page() const
See QWebSettings for details of these properties.
\qml
- WebView {
- settings.pluginsEnabled: true
- settings.standardFontFamily: "Arial"
- ...
- }
+ WebView {
+ settings.pluginsEnabled: true
+ settings.standardFontFamily: "Arial"
+ // ...
+ }
\endqml
*/
QDeclarativeWebSettings* QDeclarativeWebView::settingsObject() const
--
cgit v0.12
From a915e0cd275c171b838ccf7105b4463fbc1042e0 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Wed, 2 Feb 2011 14:57:53 +0100
Subject: Doc: Renamed an image to ensure that it does not clash with another.
Task-number: QTBUG-17120
---
doc/src/images/combobox.png | Bin 5022 -> 0 bytes
doc/src/images/modelview-combobox.png | Bin 0 -> 5022 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
delete mode 100755 doc/src/images/combobox.png
create mode 100755 doc/src/images/modelview-combobox.png
diff --git a/doc/src/images/combobox.png b/doc/src/images/combobox.png
deleted file mode 100755
index d172b41..0000000
Binary files a/doc/src/images/combobox.png and /dev/null differ
diff --git a/doc/src/images/modelview-combobox.png b/doc/src/images/modelview-combobox.png
new file mode 100755
index 0000000..d172b41
Binary files /dev/null and b/doc/src/images/modelview-combobox.png differ
--
cgit v0.12
From 4f63245be8494967bc0ecd711a705b9dc5c30960 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Wed, 2 Feb 2011 14:58:56 +0100
Subject: Fixed a bug that caused marked up inline text to be truncated.
---
tools/qdoc3/cppcodemarker.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/qdoc3/cppcodemarker.cpp b/tools/qdoc3/cppcodemarker.cpp
index 9ad4d90..1b1e8f2 100644
--- a/tools/qdoc3/cppcodemarker.cpp
+++ b/tools/qdoc3/cppcodemarker.cpp
@@ -1085,7 +1085,7 @@ QString CppCodeMarker::addMarkUp(const QString &in,
}
QString text;
- if (tag.isEmpty() && i == code.length())
+ if ((tag.isEmpty() || second == 1) && i == code.length())
text = code.mid(second - 1, i - second + 1);
else
text = code.mid(second - 1, i - second);
--
cgit v0.12
From 871d80f4a02a645a79c87fd0b02374e950e47aa3 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Wed, 2 Feb 2011 17:05:36 +0100
Subject: Doc: Fixed a reference to the wrong image.
Task-number: QTBUG-17120
---
doc/src/tutorials/modelview.qdoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/src/tutorials/modelview.qdoc b/doc/src/tutorials/modelview.qdoc
index 88cda72..679d2a9 100644
--- a/doc/src/tutorials/modelview.qdoc
+++ b/doc/src/tutorials/modelview.qdoc
@@ -104,7 +104,7 @@
array of the data elements that the user can change. The table widget can be
integrated into a program flow by reading and writing the data elements that
the table widget provides.
-
+
This method is very intuitive and useful in many applications, but displaying
and editing a database table with a standard table widget can be problematic.
Two copies of the data have to be coordinated: one outside the
@@ -156,7 +156,7 @@
\o
\o \l QColumnView shows a tree as a hierarchy of lists
\row
- \o \inlineimage combobox.png
+ \o \inlineimage modelview-combobox.png
\o {2, 1} \l QComboBox can work as both a view class and also
as a traditional widget
\endtable
--
cgit v0.12