diff options
| author | Svenn-Arne Dragly <s@dragly.com> | 2018-08-25 16:34:40 +0200 |
|---|---|---|
| committer | Svenn-Arne Dragly <svenn-arne.dragly@qt.io> | 2018-09-03 13:33:37 +0000 |
| commit | 7f3d98c5326de1a6800f5d91b9f53874b4a71fa7 (patch) | |
| tree | c51651015a0a20421b5e93bbe0fff4ad27aaeec0 | |
| parent | 61ba7f75931bddcfdc411eeb518478397e0f309a (diff) | |
Move forward declaration of QMetaObject inside Qt namespace
Otherwise, tests can fail to build with the error: "reference to
'QMetaObject' is ambiguous" because ::QMetaObject is found in
qnodecreatedchange_p.h and TestNamespace::QMetaObject is found in
qobject.h.
Change-Id: I533fc8013cb25ddddf11eec512eb40a419cd53d5
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit 026545cb39dcd452757e7b785ae688ca201c7a92)
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| -rw-r--r-- | src/core/changes/qnodecreatedchange_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/changes/qnodecreatedchange_p.h b/src/core/changes/qnodecreatedchange_p.h index cb1470970..5e4c5b91d 100644 --- a/src/core/changes/qnodecreatedchange_p.h +++ b/src/core/changes/qnodecreatedchange_p.h @@ -53,10 +53,10 @@ #include <Qt3DCore/private/qscenechange_p.h> #include <Qt3DCore/private/qt3dcore_global_p.h> -struct QMetaObject; - QT_BEGIN_NAMESPACE +struct QMetaObject; + namespace Qt3DCore { class QNode; |