diff options
author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-05-25 11:41:17 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-28 05:30:34 +0200 |
commit | 2533a40cf26ded5b777aae6b3c49813a044ab735 (patch) | |
tree | dc58ecb893b0049dba16b4926bc211fb8874ae5f /tests/auto/quick/shared/visualtestutil.h | |
parent | d4dad3a0b83c921ed4d746eb9694be8b008bcc1a (diff) |
Fix PathView not updating after all items are removed from the model.
Always clear the layoutScheduled flag on a refill even if there are no
items to create, otherwise future layouts won't be scheduled because
it appears one is already pending.
Fixes an issue in the dragselection example where items that should
have moved to the PathView instead disappeared.
Change-Id: I4302b5b43184c697a78f5c09dc3811326e2271ca
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/quick/shared/visualtestutil.h')
-rw-r--r-- | tests/auto/quick/shared/visualtestutil.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/quick/shared/visualtestutil.h b/tests/auto/quick/shared/visualtestutil.h index 9407ff8e8f..c2fc9cc01f 100644 --- a/tests/auto/quick/shared/visualtestutil.h +++ b/tests/auto/quick/shared/visualtestutil.h @@ -45,6 +45,8 @@ #include <QtQuick/QQuickItem> #include <QtQml/QQmlExpression> +#include <QtQuick/private/qquickitem_p.h> + namespace QQuickVisualTestUtil { QQuickItem *findVisibleChild(QQuickItem *parent, const QString &objectName); @@ -106,7 +108,9 @@ namespace QQuickVisualTestUtil items << qobject_cast<QQuickItem*>(findItem<T>(parent, objectName, indexes[i])); return items; } - } +#define QQUICK_VERIFY_POLISH(item) \ + QTRY_COMPARE(QQuickItemPrivate::get(item)->polishScheduled, false) + #endif // QQUICKVISUALTESTUTIL_H |