Merge "Fix regression in PFD#fromData" into qt-r1-dev