Merge branch 'update-3rdparty-qmljs'
5f1dade194a0
Actions

Authored by kfunk on Oct 24 2018, 8:58 PM.

Description

Merge branch 'update-3rdparty-qmljs'

Details

Committed

kfunk

Oct 24 2018, 8:58 PM

Parents

R32:e6f41edea53b: qmljs: Integrate updated qmljs library
R32:ca03781e690e: Merge remote-tracking branch 'origin/5.3'

Branches

Unknown

Tags

Unknown

kfunk committed R32:5f1dade194a0: Merge branch 'update-3rdparty-qmljs' (authored by kfunk).Oct 24 2018, 8:58 PM

Merged Changes

Commit	Author	Details	Committed
e6f41edea53b	kfunk	qmljs: Integrate updated qmljs library	Oct 24 2018
82276cb77d6d	kfunk	qmljs: Patch incompatible code out	Oct 24 2018
f420ee1e66fd	kfunk	qmljs: Update qmljs from QtCreator v4.7.2	Oct 24 2018

Changes (106)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
A	(dir)	plugins/qmljs/3rdparty/qtcreator-libs/3rdparty/
A	(dir)	plugins/qmljs/3rdparty/qtcreator-libs/3rdparty/optional/
A		plugins/qmljs/3rdparty/qtcreator-libs/3rdparty/optional/CMakeLists.txt
A		plugins/qmljs/3rdparty/qtcreator-libs/3rdparty/optional/LICENSE_1_0.txt
A		plugins/qmljs/3rdparty/qtcreator-libs/3rdparty/optional/README.md
A		plugins/qmljs/3rdparty/qtcreator-libs/3rdparty/optional/copyright.txt
A		plugins/qmljs/3rdparty/qtcreator-libs/3rdparty/optional/optional.hpp
A		plugins/qmljs/3rdparty/qtcreator-libs/3rdparty/optional/test_optional.cpp
A		plugins/qmljs/3rdparty/qtcreator-libs/3rdparty/optional/test_type_traits.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/CMakeLists.txt
M		plugins/qmljs/3rdparty/qtcreator-libs/languageutils/componentversion.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/languageutils/componentversion.h
M		plugins/qmljs/3rdparty/qtcreator-libs/languageutils/fakemetaobject.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/languageutils/fakemetaobject.h
M		plugins/qmljs/3rdparty/qtcreator-libs/languageutils/languageutils_global.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmldirparser.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmldirparser_p.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmlerror.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmlerror.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsast.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsast_p.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsastfwd_p.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsastvisitor.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsastvisitor_p.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsengine_p.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsengine_p.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsglobal_p.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsgrammar.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsgrammar_p.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljskeywords_p.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljslexer.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljslexer_p.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsmemorypool_p.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsparser.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/parser/qmljsparser_p.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/persistenttrie.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/persistenttrie.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljs_global.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsbind.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsbind.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsbundle.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsbundle.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsconstants.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljscontext.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljscontext.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsdialect.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsdialect.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsdocument.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsdocument.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsevaluate.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsevaluate.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsimportdependencies.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsimportdependencies.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsinterpreter.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsinterpreter.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsmodelmanagerinterface.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsmodelmanagerinterface.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsplugindumper.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsplugindumper.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsqrcparser.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsqrcparser.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsscopeastpath.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsscopeastpath.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsscopebuilder.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsscopebuilder.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsscopechain.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsscopechain.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljstypedescriptionreader.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljstypedescriptionreader.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsutils.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsutils.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsvalueowner.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsvalueowner.h
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsviewercontext.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/qmljs/qmljsviewercontext.h
M		plugins/qmljs/3rdparty/qtcreator-libs/sync_qtc.sh
M		plugins/qmljs/3rdparty/qtcreator-libs/utils/algorithm.h
M		plugins/qmljs/3rdparty/qtcreator-libs/utils/changeset.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/utils/changeset.h
M		plugins/qmljs/3rdparty/qtcreator-libs/utils/environment.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/utils/environment.h
M		plugins/qmljs/3rdparty/qtcreator-libs/utils/filesystemwatcher.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/utils/filesystemwatcher.h
M		plugins/qmljs/3rdparty/qtcreator-libs/utils/fileutils.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/utils/fileutils.h
M		plugins/qmljs/3rdparty/qtcreator-libs/utils/fileutils_mac.h
A		plugins/qmljs/3rdparty/qtcreator-libs/utils/functiontraits.h
M		plugins/qmljs/3rdparty/qtcreator-libs/utils/hostosinfo.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/utils/hostosinfo.h
M		plugins/qmljs/3rdparty/qtcreator-libs/utils/json.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/utils/json.h
A		plugins/qmljs/3rdparty/qtcreator-libs/utils/optional.h
M		plugins/qmljs/3rdparty/qtcreator-libs/utils/osspecificaspects.h
A		plugins/qmljs/3rdparty/qtcreator-libs/utils/predicates.h
M		plugins/qmljs/3rdparty/qtcreator-libs/utils/qtcassert.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/utils/qtcassert.h
A		plugins/qmljs/3rdparty/qtcreator-libs/utils/runextensions.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/utils/runextensions.h
M		plugins/qmljs/3rdparty/qtcreator-libs/utils/savefile.cpp
M		plugins/qmljs/3rdparty/qtcreator-libs/utils/savefile.h
M		plugins/qmljs/3rdparty/qtcreator-libs/utils/utils_global.h
M		plugins/qmljs/duchain/declarationbuilder.cpp
M		plugins/qmljs/duchain/declarationbuilder.h
M		plugins/qmljs/duchain/usebuilder.cpp
M		plugins/qmljs/tests/files/dynamicObjectProperties.2.qml
M		plugins/qmljs/tests/test_files.cpp