Merge "Sigh, try making everyone happy." into qt-dev