Merge "Revert "Revert "Updating EXPECTED_SDK_VERSION for Q""" into qt-dev