Merge "Properly use versioned interfaces." into qt-dev