diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2021-09-13 16:28:41 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-17 00:50:31 +0000 |
| commit | e15aa67146ee7d9523b40f0d5a82d45721b46702 (patch) | |
| tree | 93139d9459b4d655846577129cdf2c8ec7816833 /src/quick/util/qquickstatechangescript.cpp | |
| parent | b5e833e6c3b1ba8e832087a1d301d1766eb562fc (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'
Change-Id: I83110824f2a3380827c9656490af791b5d614907
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit bbfac714aed5a0e5b82dfce3953538cf68376714)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/quick/util/qquickstatechangescript.cpp')
| -rw-r--r-- | src/quick/util/qquickstatechangescript.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/quick/util/qquickstatechangescript.cpp b/src/quick/util/qquickstatechangescript.cpp index f971d7e551..8e978a2943 100644 --- a/src/quick/util/qquickstatechangescript.cpp +++ b/src/quick/util/qquickstatechangescript.cpp @@ -149,8 +149,6 @@ QQuickStateActionEvent::EventType QQuickStateChangeScript::type() const return Script; } - -#include <moc_qquickstatechangescript_p.cpp> - QT_END_NAMESPACE +#include <moc_qquickstatechangescript_p.cpp> |