Merge "sthal: using kernel header" into qt-r1-dev