Use early return to save one indentation level

* This helps to keep the code organized
  when it is extended in subsequent commits.
* It also amends 454393ec18 to remove unused group var.

Task-number: QTBUG-148476
Pick-to: 6.12 6.11
Change-Id: I4ee6823cacc35f292eaff1fd7457757cb42d7c47
Reviewed-by: Matthias Rauter <matthias.rauter@qt.io>
Reviewed-by: Vladimir Belyavsky <belyavskyv@gmail.com>
Reviewed-by: Hatem ElKharashy <hatem.elkharashy@qt.io>