[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit dbe50caee3d0cc021c374d0224809de4972ff9ab
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 24 08:11:38 2009 +0000

    qdoc: Added \brief texts to all the since 4.6 functions.
    
    Patch by Martin Smith <msmith at trolltech.com> on 2009-09-24
    Reviewed by Simon Hausmann.
    
    * Api/qwebhistory.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48708 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebhistory.cpp b/WebKit/qt/Api/qwebhistory.cpp
index 9568d33..5752d66 100644
--- a/WebKit/qt/Api/qwebhistory.cpp
+++ b/WebKit/qt/Api/qwebhistory.cpp
@@ -570,8 +570,11 @@ QByteArray QWebHistory::saveState(HistoryStateVersion version) const
   \fn QDataStream& operator<<(QDataStream& stream, const QWebHistory& history)
   \relates QWebHistory
 
-  Saves the given \a history into the specified \a stream. This is a convenience function
-  and is equivalent to calling the saveState() method.
+  \brief The operator<< function streams a history into a data stream.
+
+  It saves the \a history into the specified \a stream. This is a
+  convenience function and is equivalent to calling the saveState()
+  method.
 
   \sa QWebHistory::saveState()
 */
@@ -586,6 +589,8 @@ QDataStream& operator<<(QDataStream& stream, const QWebHistory& history)
   \relates QWebHistory
   \since 4.6
 
+  \brief The operator>> function loads a history from a data stream.
+
   Loads a QWebHistory from the specified \a stream into the given \a history.
   This is a convenience function and it is equivalent to calling the restoreState()
   method.
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 3603e86..7020ec0 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,11 @@
+2009-09-24  Martin Smith  <msmith at trolltech.com>
+
+        Reviewed by Simon Hausmann.
+
+        qdoc: Added \brief texts to all the since 4.6 functions.
+
+        * Api/qwebhistory.cpp:
+
 2009-09-23  J-P Nurmi  <jpnurmi at gmail.com>
 
         Reviewed by Simon Hausmann.

-- 
WebKit Debian packaging