Eike Ziller 8259df00d0 Merge remote-tracking branch 'origin/7.0' ...

Conflicts:
	src/plugins/mcusupport/mcupackage.cpp
	src/plugins/mcusupport/mcusupportoptions.cpp
	src/plugins/mcusupport/mcusupportoptions.h
	src/plugins/mcusupport/mcusupportoptionspage.cpp
	src/plugins/mcusupport/mcusupportplugin.cpp
	src/plugins/mcusupport/mcusupportsdk.cpp

Change-Id: Ib423e9f23877176f01b188104b0a179ed32c4770

2022-02-22 14:06:41 +01:00

..

clang_defines

clang: Fix include/resource dir confusion

2020-08-24 10:18:30 +00:00

copyable_resource

qbs build: Get rid of CopyTransformer.

2014-07-17 13:08:30 +02:00

libclang

Remove ClangRefactoring and ClangPchManager

2021-06-15 10:07:57 +00:00

pluginjson

qbs build: Enable the vcs module only for commercial plugins

2018-04-04 12:08:40 +00:00

qbsbuildconfig

qbs build: Fix excessive clang 10 warnings for qbs submodule

2020-05-11 09:33:01 +00:00

qtc

Bump version to 7.0-beta2

2022-02-14 09:17:39 +00:00

qtc_gtest_gmock

Qbs: Factor out gtest dependency check

2022-02-22 05:33:10 +00:00

sqlite_sources

Fix qbs build

2022-01-19 14:35:20 +00:00