- Merging some changes from the Qt Creator branch.