Merge "Don't allow both setRelative and setLayer for the same surface." into qt-dev