[[ Merge 6.7 rc 2 ]] Remove preprocessor directive preventing qtversion() from working