summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@nokia.com>2009-10-03 11:32:05 (GMT)
committerVolker Hilsheimer <volker.hilsheimer@nokia.com>2009-10-03 11:32:05 (GMT)
commit3f638e17143ce9ad406ae2a7705797f4e2959bc9 (patch)
treea92a2f6f18ba7c7384d5ef02f7d58dc378569dfa
parent77d2a0ee199b8570f22a1888f1bc97affb255d2e (diff)
downloadQt-3f638e17143ce9ad406ae2a7705797f4e2959bc9.zip
Qt-3f638e17143ce9ad406ae2a7705797f4e2959bc9.tar.gz
Qt-3f638e17143ce9ad406ae2a7705797f4e2959bc9.tar.bz2
Doc: silence qdoc warnings in S60 specific documentation.
Not sure why the migration classes should be are \obsolete.
-rw-r--r--src/gui/kernel/qapplication_s60.cpp3
-rw-r--r--src/gui/s60framework/qs60mainapplication.cpp4
2 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index af9fe92..807a17f 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -955,13 +955,14 @@ void QSymbianControl::setFocusSafely(bool focus)
/*!
\typedef QApplication::QS60MainApplicationFactory
+ \since 4.6
This is a typedef for a pointer to a function with the following
signature:
\snippet doc/src/snippets/code/src_corelib_global_qglobal.cpp 47
- \sa QApplication::QApplication(QApplication::QS60MainApplicationFactory, int &, char **)
+ \sa QApplication::QApplication()
*/
/*!
diff --git a/src/gui/s60framework/qs60mainapplication.cpp b/src/gui/s60framework/qs60mainapplication.cpp
index 54fb3b1..2973c97 100644
--- a/src/gui/s60framework/qs60mainapplication.cpp
+++ b/src/gui/s60framework/qs60mainapplication.cpp
@@ -63,7 +63,7 @@ _LIT(KQtWrapperResourceFile, "\\resource\\apps\\s60main.rsc");
* \class QS60MainApplication
* \obsolete
* \since 4.6
- * \brief Helper class for S60 migration
+ * \brief The QS60MainApplication class provides support for migration from S60.
*
* The QS60MainApplication provides a helper class for use in migrating from existing S60 based
* applications to Qt based applications. It is used in the exact same way as the
@@ -80,7 +80,7 @@ _LIT(KQtWrapperResourceFile, "\\resource\\apps\\s60main.rsc");
* Unlike other Qt classes, QS60MainApplication behaves like an S60 class, and can throw Symbian
* leaves.
*
- * \sa QS60MainDocument, QS60MainAppUi, QApplication::QApplication(QApplication::QS60MainApplicationFactory, int &, char **)
+ * \sa QS60MainDocument, QS60MainAppUi, QApplication::QS60MainApplicationFactory
*/
/*!