diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2019-02-12 14:47:15 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-02-14 07:18:11 +0000 |
| commit | b00efbf0edd9b4bb206570f653f4451f3522961c (patch) | |
| tree | b7cfccbdcba39c93b3015275a2e02c50327080af /tests/auto/quick/shared | |
| parent | e6199a8357cb9a97a3de0e86af387ddbe15a18ea (diff) | |
viewtestutil.h: fix broken namespace build
Surround the header in QT_BEGIN_NAMESPACE/QT_END_NAMESPACE
to avoid ambiguous references to the QQuickTest namespace.
Change-Id: Ib2f991bc55e292e020417eca35c99f2bf844ffb6
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'tests/auto/quick/shared')
| -rw-r--r-- | tests/auto/quick/shared/viewtestutil.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/quick/shared/viewtestutil.h | 4 |
2 files changed, 7 insertions, 0 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>) |