diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-03 11:01:45 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-03 11:01:45 +0100 |
| commit | da5083c11df4d9a6decd8d724098b6f108c4ab35 (patch) | |
| tree | ee331004123ef2795025637c2905d9719f95f317 /src/quick/items/qquickitem.cpp | |
| parent | 462904396454ed0ee931c2a8f2b02c8a6508965a (diff) | |
| parent | ef502bd71a0d81f1428263a11c38cd7c893ac515 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
tools/qmljs/qmljs.cpp
Change-Id: Ifa9e74bdb780eaff22fbc9ba1c514d0078a3fb29
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index fd872a5912..a05bb1617e 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -6303,7 +6303,7 @@ QPointF QQuickItem::position() const void QQuickItem::setX(qreal v) { Q_D(QQuickItem); - if (qIsNaN(v)) + if (qt_is_nan(v)) return; if (d->x == v) return; @@ -6320,7 +6320,7 @@ void QQuickItem::setX(qreal v) void QQuickItem::setY(qreal v) { Q_D(QQuickItem); - if (qIsNaN(v)) + if (qt_is_nan(v)) return; if (d->y == v) return; |