Merge "Fix a bug in ProtoFileReader." into qt-dev