Merge "Fix unknown resource type error message" into qt-dev