devel/qtcreator: fix crashes under certain circumstances

A regression was detected that causes crashes under certain conditions.
This is fixed by

https://codereview.qt-project.org/#/c/163443/

incorporated with this updated patchset.

PR: 210530
Submitted by: Ralf Nolden <nolden@kde.org> (kde)