summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/dbus/qdbusconnection.cpp5
-rw-r--r--src/declarative/qml/qdeclarativeimageprovider.cpp8
-rw-r--r--src/declarative/util/qdeclarativeanimation.cpp2
-rw-r--r--src/declarative/util/qdeclarativetransition.cpp2
-rw-r--r--src/gui/graphicsview/qgraphicsitem.cpp18
-rw-r--r--src/gui/graphicsview/qgraphicstransform.cpp21
-rw-r--r--src/gui/s60framework/qs60mainapplication.cpp4
-rw-r--r--src/gui/s60framework/qs60mainappui.cpp30
-rw-r--r--src/network/access/qnetworkrequest.cpp20
9 files changed, 80 insertions, 30 deletions
diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp
index 6a46eac..1b65399 100644
--- a/src/dbus/qdbusconnection.cpp
+++ b/src/dbus/qdbusconnection.cpp
@@ -228,6 +228,11 @@ void QDBusConnectionManager::setConnection(const QString &name, QDBusConnectionP
\value ExportAllInvokables export all of this object's invokables
\value ExportAllContents export all of this object's contents
\value ExportChildObjects export this object's child objects
+
+ \value ExportScriptableInvokables export this object's scriptable methods
+ \value ExportNonScriptableInvokables export this object's non-scriptable methods
+ \value ExportAllInvokables export all of this object's methods
+
\sa registerObject(), QDBusAbstractAdaptor, {usingadaptors.html}{Using adaptors}
*/
diff --git a/src/declarative/qml/qdeclarativeimageprovider.cpp b/src/declarative/qml/qdeclarativeimageprovider.cpp
index 241df87..4743a1b 100644
--- a/src/declarative/qml/qdeclarativeimageprovider.cpp
+++ b/src/declarative/qml/qdeclarativeimageprovider.cpp
@@ -59,13 +59,13 @@ public:
\list
\o Loaded using QPixmaps rather than actual image files
- \o Loaded asynchronously in a separate thread, if imageType() is \l ImageType::Image
+ \o Loaded asynchronously in a separate thread, if imageType() is \l{QDeclarativeImageProvider::ImageType}{ImageType::Image}
\endlist
To specify that an image should be loaded by an image provider, use the
\bold {"image:"} scheme for the URL source of the image, followed by the
identifiers of the image provider and the requested image. For example:
-
+
\qml
Image { source: "image://myimageprovider/image.png" }
\endqml
@@ -83,7 +83,7 @@ public:
and "red", respectively:
\snippet examples/declarative/cppextensions/imageprovider/imageprovider-example.qml 0
-
+
When these images are loaded by QML, it looks for a matching image provider
and calls its requestImage() or requestPixmap() method (depending on its
imageType()) to load the image. The method is called with the \c id
@@ -136,7 +136,7 @@ public:
main thread. In this case, if \l {Image::}{asynchronous} is set to
\c true, the value is ignored and the image is loaded
synchronously.
-
+
\sa QDeclarativeEngine::addImageProvider()
*/
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 14028de..927f081 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -1329,7 +1329,7 @@ void QDeclarativeVector3dAnimation::setTo(QVector3D t)
\snippet doc/src/snippets/declarative/rotationanimation.qml 0
- Notice the RotationAnimation did not need to set a \l {PropertyAnimation::}{target}
+ Notice the RotationAnimation did not need to set a \l target
value. As a convenience, when used in a transition, RotationAnimation will rotate all
properties named "rotation" or "angle". You can override this by providing
your own properties via \l {PropertyAnimation::properties}{properties} or
diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/declarative/util/qdeclarativetransition.cpp
index 7042d0c..aa1426c 100644
--- a/src/declarative/util/qdeclarativetransition.cpp
+++ b/src/declarative/util/qdeclarativetransition.cpp
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
to (50, 50). The added Transition specifies that when the rectangle
changes between the default and the "moved" state, any changes
to the \c x and \c y properties should be animated, using an \c Easing.InOutQuad.
-
+
\snippet doc/src/snippets/declarative/transition.qml 0
Notice the example does not require \l{PropertyAnimation::}{to} and
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)
{
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp
index 911eadc..8710cb6 100644
--- a/src/network/access/qnetworkrequest.cpp
+++ b/src/network/access/qnetworkrequest.cpp
@@ -174,12 +174,12 @@ QT_BEGIN_NAMESPACE
When using this flag with sequential upload data, the ContentLengthHeader
header must be set.
- \value HttpPipeliningAllowedAttribute
+ \value HttpPipeliningAllowedAttribute
Requests only, type: QVariant::Bool (default: false)
Indicates whether the QNetworkAccessManager code is
allowed to use HTTP pipelining with this request.
- \value HttpPipeliningWasUsedAttribute
+ \value HttpPipeliningWasUsedAttribute
Replies only, type: QVariant::Bool
Indicates whether the HTTP pipelining was used for receiving
this reply.
@@ -200,9 +200,9 @@ QT_BEGIN_NAMESPACE
See http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag for more information.
- \since 4.7
+ (This value was introduced in 4.7.)
- \value CookieSaveControlAttribute
+ \value CookieSaveControlAttribute
Requests only, type: QVariant::Int (default: QNetworkRequest::Automatic)
Indicates whether to save 'Cookie' headers received from the server in reply
to the request.
@@ -213,9 +213,9 @@ QT_BEGIN_NAMESPACE
See http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag for more information.
- \since 4.7
+ (This value was introduced in 4.7.)
- \value AuthenticationReuseControlAttribute
+ \value AuthenticationReuseAttribute
Requests only, type: QVariant::Int (default: QNetworkRequest::Automatic)
Indicates whether to use cached authorization credentials in the request,
if available. If this is set to QNetworkRequest::Manual and the authentication
@@ -228,7 +228,13 @@ QT_BEGIN_NAMESPACE
See http://www.w3.org/TR/XMLHttpRequest2/#credentials-flag for more information.
- \since 4.7
+ (This value was introduced in 4.7.)
+
+ \omitvalue MaximumDownloadBufferSizeAttribute
+ (This value was introduced in 4.7.)
+
+ \omitvalue DownloadBufferAttribute
+ (This value was introduced in 4.7.)
\value User
Special type. Additional information can be passed in
generated by cgit v0.12 at 2025-04-28 11:10:58 (GMT)