summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/graphicsview/qgraphicsitem.cpp15
-rw-r--r--src/gui/graphicsview/qgraphicstransform.cpp18
-rw-r--r--src/gui/s60framework/qs60mainapplication.cpp7
-rw-r--r--src/gui/s60framework/qs60mainappui.cpp30
-rw-r--r--src/gui/widgets/qcombobox.cpp2
5 files changed, 54 insertions, 18 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index d6eabf6..0b3b164 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -7758,6 +7758,21 @@ void QGraphicsItemPrivate::resetHeight()
}
/*!
+ \property QGraphicsObject::children
+ \internal
+*/
+
+/*!
+ \property QGraphicsObject::width
+ \internal
+*/
+
+/*!
+ \property QGraphicsObject::height
+ \internal
+*/
+
+/*!
\property QGraphicsObject::parent
\brief the parent of the item
diff --git a/src/gui/graphicsview/qgraphicstransform.cpp b/src/gui/graphicsview/qgraphicstransform.cpp
index 27dceb8..bd3f2ef 100644
--- a/src/gui/graphicsview/qgraphicstransform.cpp
+++ b/src/gui/graphicsview/qgraphicstransform.cpp
@@ -345,6 +345,24 @@ void QGraphicsScale::applyTo(QMatrix4x4 *matrix) const
*/
/*!
+ \fn QGraphicsScale::xScaleChanged()
+
+ QGraphicsScale emits this signal when its xScale changes.
+*/
+
+/*!
+ \fn QGraphicsScale::yScaleChanged()
+
+ QGraphicsScale emits this signal when its yScale changes.
+*/
+
+/*!
+ \fn QGraphicsScale::zScaleChanged()
+
+ QGraphicsScale emits this signal when its zScale changes.
+*/
+
+/*!
\fn QGraphicsScale::scaleChanged()
This signal is emitted whenever the xScale, yScale, or zScale
diff --git a/src/gui/s60framework/qs60mainapplication.cpp b/src/gui/s60framework/qs60mainapplication.cpp
index 185c06f..5d4c54e 100644
--- a/src/gui/s60framework/qs60mainapplication.cpp
+++ b/src/gui/s60framework/qs60mainapplication.cpp
@@ -136,13 +136,16 @@ TFileName QS60MainApplication::ResourceFileName() const
return KNullDesC();
}
+/*!
+ \internal
+*/
void QS60MainApplication::PreDocConstructL()
{
QS60MainApplicationBase::PreDocConstructL();
}
/*!
- \internal
+ \internal
*/
CDictionaryStore *QS60MainApplication::OpenIniFileLC(RFs &aFs) const
{
@@ -150,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 72cf577..ea9dbb3 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)
{
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp
index dcc328f..917a325 100644
--- a/src/gui/widgets/qcombobox.cpp
+++ b/src/gui/widgets/qcombobox.cpp
@@ -910,7 +910,7 @@ QComboBox::QComboBox(bool rw, QWidget *parent, const char *name)
interaction. The highlighted() signal is emitted when the user
highlights an item in the combobox popup list. All three signals
exist in two versions, one with a QString argument and one with an
- \c int argument. If the user selectes or highlights a pixmap, only
+ \c int argument. If the user selects or highlights a pixmap, only
the \c int signals are emitted. Whenever the text of an editable
combobox is changed the editTextChanged() signal is emitted.