From 8af8b8a8ac519146f879846c283c8a53f3fc7e91 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Wed, 25 May 2011 12:01:38 +0200
Subject: Doc: Added a note about the <style> element in rich text strings.

Suggested-by: Leena Miettinen
---
 doc/src/frameworks-technologies/richtext.qdoc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/src/frameworks-technologies/richtext.qdoc b/doc/src/frameworks-technologies/richtext.qdoc
index 59d7104..2164dd6 100644
--- a/doc/src/frameworks-technologies/richtext.qdoc
+++ b/doc/src/frameworks-technologies/richtext.qdoc
@@ -1017,6 +1017,11 @@
     \row    \o \c strong
             \o Strong
             \o Same as \c b.
+    \row    \o \c style
+            \o Style sheet
+            \o Allows styling information to be included with the rich text.
+               A \l{#CSS Properties}{limited subset of CSS syntax} can be
+               used to change the appearance of the text.
     \row    \o \c sub
             \o Subscript
             \o
@@ -1210,5 +1215,4 @@
 
     All CSS 2.1 selector classes are supported except pseudo-class selectors such
     as \c{:first-child}, \c{:visited} and \c{:hover}.
-
 */
-- 
cgit v0.12


From 2eeabae6faf0ad6559edce65b436a69241011382 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Wed, 25 May 2011 14:46:00 +0200
Subject: Doc: Added some more information about visited links in rich text.

---
 doc/src/frameworks-technologies/richtext.qdoc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/src/frameworks-technologies/richtext.qdoc b/doc/src/frameworks-technologies/richtext.qdoc
index 2164dd6..236c20c 100644
--- a/doc/src/frameworks-technologies/richtext.qdoc
+++ b/doc/src/frameworks-technologies/richtext.qdoc
@@ -880,6 +880,10 @@
     \row    \o \c a
             \o Anchor or link
             \o Supports the \c href and \c name attributes.
+               Note that the \c{:visited} selector is one of those
+               that is not supported by the rich text engine.
+               See \l{#Supported CSS Selectors}{below} for a list
+               of others.
     \row    \o \c address
             \o Address
             \o
-- 
cgit v0.12


From af6f81057b99981880bf9aa26df1a5b838b6405f Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Wed, 25 May 2011 14:46:49 +0200
Subject: Undo accidental breakage.

Undo breakage caused by 3abaecc3aec4e46f1c5969c33875fd45aa542385.
Reviewed-by: Kai Koehne
---
 src/declarative/debugger/qdeclarativedebugservice_p.h | 2 +-
 src/declarative/debugger/qpacketprotocol_p.h          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/declarative/debugger/qdeclarativedebugservice_p.h b/src/declarative/debugger/qdeclarativedebugservice_p.h
index 4f1f1a6..42d4482 100644
--- a/src/declarative/debugger/qdeclarativedebugservice_p.h
+++ b/src/declarative/debugger/qdeclarativedebugservice_p.h
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 class QDeclarativeDebugServicePrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugService : public QObject
+class Q_DECLARATIVE_EXPORT QDeclarativeDebugService : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QDeclarativeDebugService)
diff --git a/src/declarative/debugger/qpacketprotocol_p.h b/src/declarative/debugger/qpacketprotocol_p.h
index df3b170..49303e1 100644
--- a/src/declarative/debugger/qpacketprotocol_p.h
+++ b/src/declarative/debugger/qpacketprotocol_p.h
@@ -59,7 +59,7 @@ class QPacket;
 class QPacketAutoSend;
 class QPacketProtocolPrivate;
 
-class Q_DECLARATIVE_PRIVATE_EXPORT QPacketProtocol : public QObject
+class Q_DECLARATIVE_EXPORT QPacketProtocol : public QObject
 {
 Q_OBJECT
 public:
@@ -91,7 +91,7 @@ private:
 };
 
 
-class Q_DECLARATIVE_PRIVATE_EXPORT QPacket : public QDataStream
+class Q_DECLARATIVE_EXPORT QPacket : public QDataStream
 {
 public:
     QPacket();
-- 
cgit v0.12