Eike Ziller 3944162039 Merge remote-tracking branch 'origin/4.13' into master ...

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
	src/plugins/cmakeprojectmanager/cmakebuildstep.h
	tests/auto/debugger/tst_namedemangler.cpp
	tests/auto/qml/codemodel/check/tst_check.cpp

Change-Id: Iefd5f71c03c0078513b76a92af764a4fb22ee4c2

2020-08-10 15:56:54 +02:00

..

check

Merge remote-tracking branch 'origin/4.13' into master

2020-08-10 15:56:54 +02:00

dependencies

CMake Build: rename target qmljs to QmlJS

2020-01-16 17:32:24 +00:00

ecmascript7

CMake Build: rename target qmljs to QmlJS

2020-01-16 17:32:24 +00:00

importscheck

QmlJS: Add workaround for missing imports in Qt >=5.15.0

2020-05-21 07:54:08 +00:00

CMakeLists.txt

Qt Creator CMake port

2019-05-17 13:33:28 +00:00

codemodel.pro

qmljs: basic ECMAscript 7 test suite

2018-12-20 15:19:19 +00:00

codemodel.qbs

Tests: Provide qbs file for newly added test

2016-07-15 04:38:40 +00:00