Merge "Prevent file descriptor leak" into qt-dev