diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-01-26 11:46:56 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-01-26 11:46:56 +0100 |
| commit | 9225ac7348c9023093b6ef8d4519087c7dddeaa2 (patch) | |
| tree | 4660e25bd5cfd4a2a40b0ad97ea689c4acb22a8c /src/quick/items/qquickitem.cpp | |
| parent | 9d8fe2ac121162c15be6728495be2235b728325a (diff) | |
| parent | 0076c44d3993f377ad6417d3bb08109b608dfbd2 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/pointerhandler
Change-Id: I7962fd2282792c43af69784c8e98fb050fd928a7
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 55e82a7a4d..98cc3112df 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -1568,7 +1568,7 @@ QQuickLayoutMirroringAttached::QQuickLayoutMirroringAttached(QObject *parent) : if (itemPrivate) itemPrivate->extra.value().layoutDirectionAttached = this; else - qmlInfo(parent) << tr("LayoutDirection attached property only works with Items and Windows"); + qmlWarning(parent) << tr("LayoutDirection attached property only works with Items and Windows"); } QQuickLayoutMirroringAttached * QQuickLayoutMirroringAttached::qmlAttachedProperties(QObject *object) @@ -1716,7 +1716,7 @@ QQuickEnterKeyAttached::QQuickEnterKeyAttached(QObject *parent) itemPrivate = QQuickItemPrivate::get(item); itemPrivate->extra.value().enterKeyAttached = this; } else - qmlInfo(parent) << tr("EnterKey attached property only works with Items"); + qmlWarning(parent) << tr("EnterKey attached property only works with Items"); } QQuickEnterKeyAttached *QQuickEnterKeyAttached::qmlAttachedProperties(QObject *object) @@ -4383,7 +4383,7 @@ void QQuickItem::mapFromItem(QQmlV4Function *args) const } if (!itemObj && !item->isNull()) { - qmlInfo(this) << "mapFromItem() given argument \"" << item->toQStringNoThrow() + qmlWarning(this) << "mapFromItem() given argument \"" << item->toQStringNoThrow() << "\" which is neither null nor an Item"; v4->throwTypeError(); return; @@ -4471,7 +4471,7 @@ void QQuickItem::mapToItem(QQmlV4Function *args) const } if (!itemObj && !item->isNull()) { - qmlInfo(this) << "mapToItem() given argument \"" << item->toQStringNoThrow() + qmlWarning(this) << "mapToItem() given argument \"" << item->toQStringNoThrow() << "\" which is neither null nor an Item"; v4->throwTypeError(); return; @@ -8409,7 +8409,7 @@ void QQuickItemWrapper::markObjects(QV4::Heap::Base *that, QV4::ExecutionEngine { QObjectWrapper::Data *This = static_cast<QObjectWrapper::Data *>(that); if (QQuickItem *item = static_cast<QQuickItem*>(This->object())) { - foreach (QQuickItem *child, QQuickItemPrivate::get(item)->childItems) + for (QQuickItem *child : qAsConst(QQuickItemPrivate::get(item)->childItems)) QV4::QObjectWrapper::markWrapper(child, e); } QV4::QObjectWrapper::markObjects(that, e); |