diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 17:36:04 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 17:36:04 +0100 |
commit | ad67ec26d0cbc98e3440dd38bb20eef4da2ee96d (patch) | |
tree | 9f8135751df2f995a4f55837ea065a4687245b71 /src/quick/items/qquickitem.cpp | |
parent | 83a16630c13969e68cd3a5aaab73335ccb0d4414 (diff) | |
parent | 20d160d0513a04be187ed851a25b029f47c27b27 (diff) |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
.qmake.conf
LICENSE.GPLv2
examples/qml/networkaccessmanagerfactory/view.qml
src/qml/jsruntime/qv4runtime.cpp
src/qml/jsruntime/qv4stringobject.cpp
Change-Id: I5d12f436d60995e51d5c2f59d364e9cbc24f8e32
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
-rw-r--r-- | src/quick/items/qquickitem.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index b1aeda4091..4157fc4a66 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -1757,11 +1757,9 @@ void QQuickItemPrivate::updateSubFocusItem(QQuickItem *scope, bool focus) QQmlProperty(), or QMetaProperty::write() when you need to modify those properties from C++. This ensures that the QML engine knows about the property change. Otherwise, the engine won't be able to carry out your - requested animation. For example, if you call \l setPosition() directly, - any behavior that reacts to changes in the x or y properties will not take - effect, as you are bypassing Qt's meta-object system. Note that these - functions incur a slight performance penalty. For more details, see - \l {Accessing Members of a QML Object Type from C++}. + requested animation. + Note that these functions incur a slight performance penalty. For more + details, see \l {Accessing Members of a QML Object Type from C++}. \sa QQuickWindow, QQuickPaintedItem */ @@ -5053,7 +5051,7 @@ void QQuickItem::setZ(qreal v) \endqml \endtable - \sa transform, Rotation + \sa Transform, Rotation */ /*! \property QQuickItem::rotation @@ -5079,7 +5077,7 @@ void QQuickItem::setZ(qreal v) \endqml \endtable - \sa transform, Rotation + \sa Transform, Rotation */ qreal QQuickItem::rotation() const { @@ -5139,7 +5137,7 @@ void QQuickItem::setRotation(qreal r) \endqml \endtable - \sa transform, Scale + \sa Transform, Scale */ /*! \property QQuickItem::scale @@ -5178,7 +5176,7 @@ void QQuickItem::setRotation(qreal r) \endqml \endtable - \sa transform, Scale + \sa Transform, Scale */ qreal QQuickItem::scale() const { @@ -6368,7 +6366,7 @@ void QQuickItem::setSize(const QSizeF &size) d->heightValid = true; d->widthValid = true; - if (QSizeF(d->width, d->height) == size) + if (d->width == size.width() && d->height == size.height()) return; qreal oldHeight = d->height; |