forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/9.0' into 10.0
Conflicts: share/qtcreator/translations/qtcreator_zh_CN.ts Change-Id: Iedd37c310b312223bd8a455479770e9359719a07
This commit is contained in:
Conflicts: share/qtcreator/translations/qtcreator_zh_CN.ts Change-Id: Iedd37c310b312223bd8a455479770e9359719a07