diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2020-03-04 10:41:59 +0100 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2020-03-04 10:15:16 +0000 |
| commit | a82f707ee5a1590385c11064b0bf8f720830399e (patch) | |
| tree | d4964650e16507cd2f0b15dbbabe41d25d5161fa /src/libs | |
| parent | 103a602f8db7cdeede0355e3fa2b0f417f8cbaf5 (diff) | |
QmlJS: Fix up compile fix
Amends 33b091bd40187449a3e925659ae0738786e09de3.
Change-Id: I26d98bae8a074f7c3515b46994afd5548e2ca82f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/qmljs/parser/qmljsdiagnosticmessage_p.h | 4 | ||||
| -rw-r--r-- | src/libs/qmljs/parser/qmljslexer.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/libs/qmljs/parser/qmljsdiagnosticmessage_p.h b/src/libs/qmljs/parser/qmljsdiagnosticmessage_p.h index 72ed3f83c6..e3c2cf56e8 100644 --- a/src/libs/qmljs/parser/qmljsdiagnosticmessage_p.h +++ b/src/libs/qmljs/parser/qmljsdiagnosticmessage_p.h @@ -93,8 +93,8 @@ public: }; } // namespace QmlJS +QT_QML_END_NAMESPACE + QT_BEGIN_NAMESPACE Q_DECLARE_TYPEINFO(QmlJS::DiagnosticMessage, Q_MOVABLE_TYPE); QT_END_NAMESPACE - -QT_QML_END_NAMESPACE diff --git a/src/libs/qmljs/parser/qmljslexer.cpp b/src/libs/qmljs/parser/qmljslexer.cpp index 512a545b13..ec8bf60a2a 100644 --- a/src/libs/qmljs/parser/qmljslexer.cpp +++ b/src/libs/qmljs/parser/qmljslexer.cpp @@ -35,11 +35,12 @@ #include <QtCore/qdebug.h> #include <QtCore/QScopedValueRollback> -QT_QML_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok); QT_END_NAMESPACE +QT_QML_BEGIN_NAMESPACE + using namespace QmlJS; static inline int regExpFlagFromChar(const QChar &ch) |