Fix up the Qt version check.
Merge topic 'expand-version-of-Qt5-gui-fix' into next

73c089b Fix up the Qt version check.