diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2021-09-13 16:28:41 +0200 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2021-09-16 19:12:26 +0000 |
| commit | bbfac714aed5a0e5b82dfce3953538cf68376714 (patch) | |
| tree | 18c6e16d96641d42f307559f62a327e913249b01 /src/quick/items/qquickstateoperations.cpp | |
| parent | 5ed7c78c6b996a6caadd567c17d100d1a1c762f6 (diff) | |
Move moc includes out of the namespace
When building with namespace enabled it creates weird errors:
In file included from /qt/src/qtdeclarative/src/quick/util/qquickstatechangescript.cpp:149:
In file included from /qt/android/qtdeclarative/src/quick/Quick_autogen/include\moc_qquickstatechangescript_p.cpp:11:
In file included from /qt/android/qtbase/include\QtNetwork/QSslError:1:
In file included from /qt/android/qtbase/include/QtNetwork/qsslerror.h:1:
In file included from /qt/android/qtbase/include/QtNetwork/../../../../src/qtbase/src/network/ssl/qsslerror.h:46:
In file included from /qt/android/qtbase/include\QtNetwork/qsslcertificate.h:1:
/qt/android/qtbase/include/QtNetwork/../../../../src/qtbase/src/network/ssl/qsslcertificate.h:170:1: error: class template specialization of 'QMetaTypeId' not in a namespace enclosing 'qt'
Pick-to: 6.2
Change-Id: I83110824f2a3380827c9656490af791b5d614907
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/quick/items/qquickstateoperations.cpp')
| -rw-r--r-- | src/quick/items/qquickstateoperations.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/quick/items/qquickstateoperations.cpp b/src/quick/items/qquickstateoperations.cpp index 0853ba2d0e..ec91bb0294 100644 --- a/src/quick/items/qquickstateoperations.cpp +++ b/src/quick/items/qquickstateoperations.cpp @@ -1365,7 +1365,6 @@ void QQuickAnchorChanges::saveTargetValues() d->toHeight = d->target->height(); } -#include <moc_qquickstateoperations_p.cpp> - QT_END_NAMESPACE +#include <moc_qquickstateoperations_p.cpp> |