From 2bfff24add67c1e5e0b1273a4b0399d9d94316c1 Mon Sep 17 00:00:00 2001
From: Martin Smith <msmith@trolltech.com>
Date: Fri, 2 Oct 2009 14:04:43 +0200
Subject: doc: Fixed numerous qdoc errors.

---
 doc/src/frameworks-technologies/gestures.qdoc  | 2 --
 doc/src/qt-resources.qdoc                      | 1 +
 examples/gestures/imageviewer/imagewidget.cpp  | 2 +-
 src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp | 2 ++
 src/3rdparty/webkit/WebKit/qt/Api/qwebview.h   | 1 +
 src/corelib/global/qnamespace.qdoc             | 6 ------
 src/gui/image/qpixmap_s60.cpp                  | 4 ++--
 src/testlib/qtestcase.cpp                      | 4 ++--
 tools/qdoc3/test/qt-inc.qdocconf               | 1 +
 9 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/doc/src/frameworks-technologies/gestures.qdoc b/doc/src/frameworks-technologies/gestures.qdoc
index 1e3cc47..158a273 100644
--- a/doc/src/frameworks-technologies/gestures.qdoc
+++ b/doc/src/frameworks-technologies/gestures.qdoc
@@ -102,8 +102,6 @@
 
     \snippet examples/gestures/imageviewer/imagewidget.cpp swipe slot start
 
-    \snippet examples/gestures/imageviewer/imagewidget.cpp swipe slot finish
-
     Here, we examine the direction in which the user swiped the widget and modify
     its contents accordingly.
 
diff --git a/doc/src/qt-resources.qdoc b/doc/src/qt-resources.qdoc
index a7dffe4..3b31660 100644
--- a/doc/src/qt-resources.qdoc
+++ b/doc/src/qt-resources.qdoc
@@ -41,5 +41,6 @@
 
 /*!
     \page qt-resources.html
+    \title Not Used
     \image gradient.png
 */
diff --git a/examples/gestures/imageviewer/imagewidget.cpp b/examples/gestures/imageviewer/imagewidget.cpp
index 2be6cc5..3489b5b 100644
--- a/examples/gestures/imageviewer/imagewidget.cpp
+++ b/examples/gestures/imageviewer/imagewidget.cpp
@@ -145,7 +145,7 @@ void ImageWidget::swipeTriggered()
         goNextImage();
     update();
 }
-//! [swipe slot finish]
+//! [swipe slot start]
 
 void ImageWidget::resizeEvent(QResizeEvent*)
 {
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp
index c7515ab..3c5f89f 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp
@@ -650,6 +650,7 @@ qreal QWebView::textSizeMultiplier() const
     return page()->mainFrame()->textSizeMultiplier();
 }
 
+#if !defined(Q_OS_SYMBIAN)
 /*!
     \property QWebView::renderHints
     \since 4.6
@@ -661,6 +662,7 @@ qreal QWebView::textSizeMultiplier() const
 
     \sa QPainter::renderHints()
 */
+#endif
 QPainter::RenderHints QWebView::renderHints() const
 {
     return d->renderHints;
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h
index 0f2649d..15b5836 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h
@@ -53,6 +53,7 @@ class QWEBKIT_EXPORT QWebView : public QWidget {
 
 // FIXME: temporary work around for elftran issue that it couldn't find the QPainter::staticMetaObject
 // symbol from Qt lib; it should be reverted after the right symbol is exported.  
+// remember to revert the qdoc \property comment as well.
 // See bug: http://qt.nokia.com/developer/task-tracker/index_html?method=entry&id=258893
 #if !defined(Q_OS_SYMBIAN)
     Q_PROPERTY(QPainter::RenderHints renderHints READ renderHints WRITE setRenderHints)
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 482beed..6f0b0ee 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -612,12 +612,6 @@
 */
 
 /*!
-  \enum Qt::CoordinateSystem
-  \value DeviceCoordinates
-  \value LogicalCoordinates
- */
-
-/*!
     \enum Qt::CaseSensitivity
 
     \value CaseInsensitive
diff --git a/src/gui/image/qpixmap_s60.cpp b/src/gui/image/qpixmap_s60.cpp
index 4938442..326dd10 100644
--- a/src/gui/image/qpixmap_s60.cpp
+++ b/src/gui/image/qpixmap_s60.cpp
@@ -64,7 +64,7 @@ const uchar qt_pixmap_bit_mask[] = { 0x01, 0x02, 0x04, 0x08,
                                      0x10, 0x20, 0x40, 0x80 };
 
 
-/*!
+/*
     \class QSymbianFbsClient
     \since 4.6
     \internal
@@ -145,7 +145,7 @@ void QSymbianFbsHeapLock::relock()
         qt_symbianFbsClient()->lockHeap();
 }
 
-/*!
+/*
     \class QSymbianBitmapDataAccess
     \since 4.6
     \internal
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index eb4dee1..9dea6dc 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -734,12 +734,12 @@ QT_BEGIN_NAMESPACE
     \sa QTest::qSleep()
 */
 
-/*! \fn void QTest::qWaitForWindowShown(QWidget *window)
+/*! \fn bool QTest::qWaitForWindowShown(QWidget *window)
     \since 4.6
 
     Waits until the \a window is shown in the screen. This is mainly useful for
     asynchronous systems like X11, where a window will be mapped to screen some
-    time after being asked to show itself on the screen.
+    time after being asked to show itself on the screen. Returns true.
 
     Example:
     \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 24
diff --git a/tools/qdoc3/test/qt-inc.qdocconf b/tools/qdoc3/test/qt-inc.qdocconf
index 48a0d27..2ff5682 100644
--- a/tools/qdoc3/test/qt-inc.qdocconf
+++ b/tools/qdoc3/test/qt-inc.qdocconf
@@ -115,6 +115,7 @@ Cpp.ignoredirectives    = Q_DECLARE_HANDLE \
                           Q_ENUMS \
                           Q_FLAGS \
                           Q_INTERFACES \
+			  Q_OS_SYMBIAN \
                           __attribute__
 
 HTML.stylesheets        = $QTDIR/util/qdoc3/test/classic.css
-- 
cgit v0.12