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

Merge remote-tracking branch 'origin/6.0'

Browse Source 
Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp

Change-Id: I80fe565749ad5c06dfe99436f2dc6ab4b66a2537
This commit is contained in:
Eike Ziller
2021-12-16 10:50:33 +01:00
parent 7c674e0a5b 21c1d8fd60
commit 85b60d9608
156 changed files with 2801 additions and 1439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
doc/qtcreator/src/mcu/creator-mcu-dev.qdoc
View File

@@ -197,7 +197,8 @@
\section1 Supported Qt for MCUs SDKs
Since version 4.12.4, \QC supports version 1.3 and later of the Qt for MCUs SDK.
Since version 4.12.4, \QC supports versions 1.3 through 1.9 of the Qt for MCUs SDK.
Since version 6.0.0, \QC adds support for versions 2.0 and later of the Qt for MCUs SDK.
For older versions refer to the following table.
\table
@@ -205,8 +206,11 @@
\li \QC version
\li Qt for MCUs SDK version
\row
\li 4.12.4 or later
\li 1.3 or later
\li 6.0.0 or later
\li 1.3 or later, including 2.0 or later
\row
\li 4.12.4 up to 5.0.3
\li 1.3 up to 1.9
\row
\li 4.12.2 or 4.12.3
\li 1.2