What you wrote is correct. My 1099-R in TT 2019 correctly shows the correct taxable and non-taxable amounts. Line 7 of 8606-T shows the taxable amount but it should not since I have a QCD, it should be a reduced by the QCD amount. I contend that there is an error in TT2019.
BTW I checked my 2018 TT file in which I also had IRA distribution and QCD and TT correctly had the reduced amount in line 7.
