[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 68575fe15983e8a900161cfc0c0051ceffd42602
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 23 15:17:19 2009 +0000

    2009-11-23  David Boddie  <dboddie at trolltech.com>
    
            Reviewed by Simon Hausmann.
    
            Updated the QWebElement documentation with links to examples and
            external resources.
            Fixed the project file for the webelement snippet and tidied up the
            markers used for quoting the code.
    
            * Api/qwebelement.cpp:
            * docs/webkitsnippets/webelement/main.cpp:
            (findAll):
            * docs/webkitsnippets/webelement/webelement.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51308 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebelement.cpp b/WebKit/qt/Api/qwebelement.cpp
index 8922150..441bec7 100644
--- a/WebKit/qt/Api/qwebelement.cpp
+++ b/WebKit/qt/Api/qwebelement.cpp
@@ -99,6 +99,14 @@ public:
     It is possible to replace the contents of child elements using
     setPlainText() and setInnerXml(). To replace the element itself and its
     contents, use setOuterXml().
+
+    \section1 Examples
+
+    The \l{DOM Traversal Example} shows one way to traverse documents in a running
+    example.
+
+    The \l{Simple Selector Example} can be used to experiment with the searching
+    features of this class and provides sample code you can start working with.
 */
 
 /*!
@@ -195,8 +203,7 @@ bool QWebElement::isNull() const
     \a selectorQuery. If there are no matching elements, an empty list is
     returned.
 
-    \l{http://www.w3.org/TR/REC-CSS2/selector.html#q1}{Standard CSS2 selector}
-    syntax is used for the query.
+    \l{Standard CSS2 selector} syntax is used for the query.
 
     \note This search is performed recursively.
 
@@ -211,8 +218,7 @@ QWebElementCollection QWebElement::findAll(const QString &selectorQuery) const
     Returns the first child element that matches the given CSS selector
     \a selectorQuery.
 
-    \l{http://www.w3.org/TR/REC-CSS2/selector.html#q1}{Standard CSS2 selector}
-    syntax is used for the query.
+    \l{Standard CSS2 selector} syntax is used for the query.
 
     \note This search is performed recursively.
 
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index d28e9f9..ad423e8 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,17 @@
+2009-11-23  David Boddie  <dboddie at trolltech.com>
+
+        Reviewed by Simon Hausmann.
+
+        Updated the QWebElement documentation with links to examples and
+        external resources.
+        Fixed the project file for the webelement snippet and tidied up the
+        markers used for quoting the code.
+
+        * Api/qwebelement.cpp:
+        * docs/webkitsnippets/webelement/main.cpp:
+        (findAll):
+        * docs/webkitsnippets/webelement/webelement.pro:
+
 2009-11-23  Simon Hausmann  <simon.hausmann at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit/qt/docs/webkitsnippets/webelement/main.cpp b/WebKit/qt/docs/webkitsnippets/webelement/main.cpp
index d437a6f..2707ffb 100644
--- a/WebKit/qt/docs/webkitsnippets/webelement/main.cpp
+++ b/WebKit/qt/docs/webkitsnippets/webelement/main.cpp
@@ -22,7 +22,6 @@
 #include <qwebview.h>
 #include <qwebframe.h>
 #include <qwebelement.h>
-#include <qdebug.h>
 
 static QWebFrame *frame;
 
@@ -53,9 +52,10 @@ static void findAll()
        </p>
     */
 
+//! [FindAll intro]
     QList<QWebElement> allSpans = document.findAll("span");
     QList<QWebElement> introSpans = document.findAll("p.intro span");
-//! [FindAll]
+//! [FindAll intro] //! [FindAll]
 }
 
 int main(int argc, char *argv[])
diff --git a/WebKit/qt/docs/webkitsnippets/webelement/webelement.pro b/WebKit/qt/docs/webkitsnippets/webelement/webelement.pro
index f9b403b..8ca4b59 100644
--- a/WebKit/qt/docs/webkitsnippets/webelement/webelement.pro
+++ b/WebKit/qt/docs/webkitsnippets/webelement/webelement.pro
@@ -1,5 +1,8 @@
 TEMPLATE = app
 CONFIG -= app_bundle
+CONFIG(QTDIR_build) {
+    QT       += webkit
+}
 SOURCES   = main.cpp
 include(../../../../../WebKit.pri)
 QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR

-- 
WebKit Debian packaging