3 files changed, 7 insertions, 3 deletions
diff --git a/tests/auto/quick/shared/viewtestutil.cpp b/tests/auto/quick/shared/viewtestutil.cpp
index 12d54c4bbe..5631ffe047 100644
--- a/tests/auto/quick/shared/viewtestutil.cpp
+++ b/tests/auto/quick/shared/viewtestutil.cpp
@@ -38,6 +38,7 @@
 #include <private/qquickwindow_p.h>
 #include <private/qquickitemview_p_p.h>
 
+QT_BEGIN_NAMESPACE
 
 QQuickView *QQuickViewTestUtil::createView()
 {
@@ -478,3 +479,5 @@ namespace QQuickTest {
         return true;
     }
 }
+
+QT_END_NAMESPACE
diff --git a/tests/auto/quick/shared/viewtestutil.h b/tests/auto/quick/shared/viewtestutil.h
index 3b57a29777..5e725fdf11 100644
--- a/tests/auto/quick/shared/viewtestutil.h
+++ b/tests/auto/quick/shared/viewtestutil.h
@@ -37,6 +37,8 @@ QT_FORWARD_DECLARE_CLASS(QQuickView)
 QT_FORWARD_DECLARE_CLASS(QQuickItemViewPrivate)
 QT_FORWARD_DECLARE_CLASS(FxViewItem)
 
+QT_BEGIN_NAMESPACE
+
 namespace QQuickViewTestUtil
 {
     QQuickView *createView();
@@ -189,6 +191,8 @@ namespace QQuickTest {
     bool initView(QQuickView &v, const QUrl &url, bool moveMouseOut, QByteArray *errorMessage);
 }
 
+QT_END_NAMESPACE
+
 Q_DECLARE_METATYPE(QQuickViewTestUtil::QaimModel*)
 Q_DECLARE_METATYPE(QQuickViewTestUtil::ListChange)
 Q_DECLARE_METATYPE(QList<QQuickViewTestUtil::ListChange>)
diff --git a/tests/auto/quick/shared/visualtestutil.h b/tests/auto/quick/shared/visualtestutil.h
index 1cdbaf838b..e623e3e225 100644
--- a/tests/auto/quick/shared/visualtestutil.h
+++ b/tests/auto/quick/shared/visualtestutil.h
@@ -100,7 +100,4 @@ namespace QQuickVisualTestUtil
     bool compareImages(const QImage &ia, const QImage &ib, QString *errorMessage);
 }
 
-#define QQUICK_VERIFY_POLISH(item) \
-    QTRY_COMPARE(QQuickItemPrivate::get(item)->polishScheduled, false)
-
 #endif // QQUICKVISUALTESTUTIL_H