[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

hausmann at webkit.org hausmann at webkit.org
Wed Dec 22 11:26:27 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 15e2f244fe604c8aeeab62fcdb761bc2d94e449f
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 23 14:48:14 2010 +0000

    Doc: Fixed incorrect QML property type.
    
    Patch by David Boddie <dboddie at trolltech.com> on 2010-07-23
    Reviewed by Simon Hausmann.
    
    * declarative/qdeclarativewebview.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63974 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 8ff0e56..3229234 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,11 @@
+2010-07-23  David Boddie  <dboddie at trolltech.com>
+
+        Reviewed by Simon Hausmann.
+
+        Doc: Fixed incorrect QML property type.
+
+        * declarative/qdeclarativewebview.cpp:
+
 2010-07-23  Simon Hausmann  <simon.hausmann at nokia.com>
 
         [Qt] Build fix for Qt apps
diff --git a/WebKit/qt/declarative/qdeclarativewebview.cpp b/WebKit/qt/declarative/qdeclarativewebview.cpp
index 0342c9f..9dcba60 100644
--- a/WebKit/qt/declarative/qdeclarativewebview.cpp
+++ b/WebKit/qt/declarative/qdeclarativewebview.cpp
@@ -612,7 +612,7 @@ QAction* QDeclarativeWebView::stopAction() const
 #endif // QT_NO_ACTION
 
 /*!
-    \qmlproperty real WebView::title
+    \qmlproperty string WebView::title
     This property holds the title of the web page currently viewed
 
     By default, this property contains an empty string.

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list