diff options
author | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-08-24 13:25:45 (GMT) |
---|---|---|
committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-08-24 13:25:45 (GMT) |
commit | 33a34960328cce7a6994d2ea771c82da7bfdb598 (patch) | |
tree | 88459930ecbb1d9a09a2d51f23c1dfdd675c66d1 /src/gui | |
parent | ee2db9a735a2c1f64e7f99f0ecfd40bf320911eb (diff) | |
download | Qt-4.7.0-rc1.zip Qt-4.7.0-rc1.tar.gz Qt-4.7.0-rc1.tar.bz2 |
Doc: Fixed qdoc warnings.v4.7.0-rc1
Reviewed-by: Trust Me
(cherry picked from commit cb086eb5340c4c41efaf45373aa05c37e8aa974a)
Conflicts:
doc/src/index.qdoc
src/dbus/qdbusconnection.cpp
src/declarative/util/qdeclarativeanimation.cpp
src/gui/s60framework/qs60mainapplication.cpp
src/gui/s60framework/qs60mainappui.cpp
src/network/access/qnetworkrequest.cpp
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 18 | ||||
-rw-r--r-- | src/gui/graphicsview/qgraphicstransform.cpp | 21 | ||||
-rw-r--r-- | src/gui/s60framework/qs60mainapplication.cpp | 4 | ||||
-rw-r--r-- | src/gui/s60framework/qs60mainappui.cpp | 30 |
4 files changed, 56 insertions, 17 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 6f0b48c..b70c0f2 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -7961,6 +7961,24 @@ void QGraphicsItemPrivate::resetHeight() */ /*! + \property QGraphicsObject::children + \since 4.7 + \internal +*/ + +/*! + \property QGraphicsObject::width + \since 4.7 + \internal +*/ + +/*! + \property QGraphicsObject::height + \since 4.7 + \internal +*/ + +/*! \class QAbstractGraphicsShapeItem \brief The QAbstractGraphicsShapeItem class provides a common base for all path items. diff --git a/src/gui/graphicsview/qgraphicstransform.cpp b/src/gui/graphicsview/qgraphicstransform.cpp index 7b69317..bd3f2ef 100644 --- a/src/gui/graphicsview/qgraphicstransform.cpp +++ b/src/gui/graphicsview/qgraphicstransform.cpp @@ -583,6 +583,27 @@ void QGraphicsRotation::applyTo(QMatrix4x4 *matrix) const \sa QGraphicsRotation::axis */ +/*! + \fn QGraphicsScale::xScaleChanged() + \since 4.7 + + This signal is emitted whenever the \l xScale property changes. +*/ + +/*! + \fn QGraphicsScale::yScaleChanged() + \since 4.7 + + This signal is emitted whenever the \l yScale property changes. +*/ + +/*! + \fn QGraphicsScale::zScaleChanged() + \since 4.7 + + This signal is emitted whenever the \l zScale property changes. +*/ + #include "moc_qgraphicstransform.cpp" QT_END_NAMESPACE diff --git a/src/gui/s60framework/qs60mainapplication.cpp b/src/gui/s60framework/qs60mainapplication.cpp index 5d4c54e..cbc0d5c 100644 --- a/src/gui/s60framework/qs60mainapplication.cpp +++ b/src/gui/s60framework/qs60mainapplication.cpp @@ -145,7 +145,7 @@ void QS60MainApplication::PreDocConstructL() } /*! - \internal + \internal */ CDictionaryStore *QS60MainApplication::OpenIniFileLC(RFs &aFs) const { @@ -153,7 +153,7 @@ CDictionaryStore *QS60MainApplication::OpenIniFileLC(RFs &aFs) const } /*! - \internal + \internal */ void QS60MainApplication::NewAppServerL(CApaAppServer *&aAppServer) { diff --git a/src/gui/s60framework/qs60mainappui.cpp b/src/gui/s60framework/qs60mainappui.cpp index ea9dbb3..72cf577 100644 --- a/src/gui/s60framework/qs60mainappui.cpp +++ b/src/gui/s60framework/qs60mainappui.cpp @@ -282,7 +282,7 @@ void QS60MainAppUi::RestoreMenuL(CCoeControl *menuWindow, TInt resourceId, TMenu } /*! - \internal + \internal */ void QS60MainAppUi::Exit() { @@ -290,7 +290,7 @@ void QS60MainAppUi::Exit() } /*! - \internal + \internal */ void QS60MainAppUi::SetFadedL(TBool aFaded) { @@ -298,7 +298,7 @@ void QS60MainAppUi::SetFadedL(TBool aFaded) } /*! - \internal + \internal */ TRect QS60MainAppUi::ApplicationRect() const { @@ -306,7 +306,7 @@ TRect QS60MainAppUi::ApplicationRect() const } /*! - \internal + \internal */ void QS60MainAppUi::HandleScreenDeviceChangedL() { @@ -314,7 +314,7 @@ void QS60MainAppUi::HandleScreenDeviceChangedL() } /*! - \internal + \internal */ void QS60MainAppUi::HandleApplicationSpecificEventL(TInt aType, const TWsEvent &aEvent) { @@ -322,7 +322,7 @@ void QS60MainAppUi::HandleApplicationSpecificEventL(TInt aType, const TWsEvent & } /*! - \internal + \internal */ TTypeUid::Ptr QS60MainAppUi::MopSupplyObject(TTypeUid aId) { @@ -330,7 +330,7 @@ TTypeUid::Ptr QS60MainAppUi::MopSupplyObject(TTypeUid aId) } /*! - \internal + \internal */ void QS60MainAppUi::ProcessCommandL(TInt aCommand) { @@ -338,7 +338,7 @@ void QS60MainAppUi::ProcessCommandL(TInt aCommand) } /*! - \internal + \internal */ TErrorHandlerResponse QS60MainAppUi::HandleError (TInt aError, const SExtendedError &aExtErr, TDes &aErrorText, TDes &aContextText) { @@ -346,7 +346,7 @@ TErrorHandlerResponse QS60MainAppUi::HandleError (TInt aError, const SExtendedEr } /*! - \internal + \internal */ void QS60MainAppUi::HandleViewDeactivation(const TVwsViewId &aViewIdToBeDeactivated, const TVwsViewId &aNewlyActivatedViewId) { @@ -354,7 +354,7 @@ void QS60MainAppUi::HandleViewDeactivation(const TVwsViewId &aViewIdToBeDeactiva } /*! - \internal + \internal */ void QS60MainAppUi::PrepareToExit() { @@ -362,7 +362,7 @@ void QS60MainAppUi::PrepareToExit() } /*! - \internal + \internal */ void QS60MainAppUi::HandleTouchPaneSizeChange() { @@ -370,7 +370,7 @@ void QS60MainAppUi::HandleTouchPaneSizeChange() } /*! - \internal + \internal */ void QS60MainAppUi::HandleSystemEventL(const TWsEvent &aEvent) { @@ -378,7 +378,7 @@ void QS60MainAppUi::HandleSystemEventL(const TWsEvent &aEvent) } /*! - \internal + \internal */ void QS60MainAppUi::Reserved_MtsmPosition() { @@ -386,7 +386,7 @@ void QS60MainAppUi::Reserved_MtsmPosition() } /*! - \internal + \internal */ void QS60MainAppUi::Reserved_MtsmObject() { @@ -394,7 +394,7 @@ void QS60MainAppUi::Reserved_MtsmObject() } /*! - \internal + \internal */ void QS60MainAppUi::HandleForegroundEventL(TBool aForeground) { |