Merge "Fix the mismatch between compliantWith and validateModel." into qt-dev