feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS: Fix up compile fix

Browse Source 
Amends 33b091bd40.

Change-Id: I26d98bae8a074f7c3515b46994afd5548e2ca82f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Christian Stenger
2020-03-04 10:41:59 +01:00
parent 103a602f8d
commit a82f707ee5
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/qmljs/parser/qmljsdiagnosticmessage_p.h
View File

@@ -93,8 +93,8 @@ public:
}; };
} // namespace QmlJS } // namespace QmlJS
QT_QML_END_NAMESPACE
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
Q_DECLARE_TYPEINFO(QmlJS::DiagnosticMessage, Q_MOVABLE_TYPE); Q_DECLARE_TYPEINFO(QmlJS::DiagnosticMessage, Q_MOVABLE_TYPE);
QT_END_NAMESPACE QT_END_NAMESPACE
QT_QML_END_NAMESPACE

3
src/libs/qmljs/parser/qmljslexer.cpp
View File

@@ -35,11 +35,12 @@
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
#include <QtCore/QScopedValueRollback> #include <QtCore/QScopedValueRollback>
QT_QML_BEGIN_NAMESPACE
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok); Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok);
QT_END_NAMESPACE QT_END_NAMESPACE
QT_QML_BEGIN_NAMESPACE
using namespace QmlJS; using namespace QmlJS;
static inline int regExpFlagFromChar(const QChar &ch) static inline int regExpFlagFromChar(const QChar &ch)