Merge "Fix compressed stubs" into qt-dev