Merge "Honor the property overrides for GLES." into qt-dev