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

Fix build with Qt 6: qstrtod is an inline function

Browse Source 
Change-Id: Ib620871532484bcaa43cfffd1628d6bf0f93fd78
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Thiago Macieira
2020-08-06 18:03:03 -07:00
parent be16ac2371
commit 149cc3af6b
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,9 +35,7 @@
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
#include <QtCore/QScopedValueRollback> #include <QtCore/QScopedValueRollback>
QT_BEGIN_NAMESPACE #include <QtCore/private/qlocale_tools_p.h>
Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok);
QT_END_NAMESPACE
QT_QML_BEGIN_NAMESPACE QT_QML_BEGIN_NAMESPACE

2
src/libs/qmljs/qmljs-lib.pri
View File

@@ -84,4 +84,4 @@ contains(QT, gui) {
$$PWD/qmljsreformatter.h $$PWD/qmljsreformatter.h
} }
QT += xml QT += xml core-private