Merge "Replace usage of deprecated external files method" into qt-dev