Changeset 846 for trunk/src/gui/graphicsview/qgraphicstransform.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/graphicsview/qgraphicstransform.cpp (modified) (6 diffs)

trunk/src/gui/graphicsview/qgraphicstransform.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -55 +55 @@
     order, one at a time, to the QGraphicsItem it's assigned to.
 
-    QGraphicsTransform is particularily useful for animations. Whereas
+    QGraphicsTransform is particularly useful for animations. Whereas
     QGraphicsItem::setTransform() lets you assign any transform directly to an
     item, there is no direct way to interpolate between two different
@@ -268 +268 @@
     d->xScale = scale;
     update();
+    emit xScaleChanged();
     emit scaleChanged();
 }
@@ -294 +295 @@
     d->yScale = scale;
     update();
+    emit yScaleChanged();
     emit scaleChanged();
 }
@@ -320 +322 @@
     d->zScale = scale;
     update();
+    emit zScaleChanged();
     emit scaleChanged();
 }
@@ -340 +343 @@
 
     \sa QGraphicsScale::origin
+*/
+
+/*!
+    \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.
 */