To make it possible to pass similar configure parameters to both S3_1 and master, replace configure options --with-qt5 (master) and --with-qt6 (S3_1) by uniform --with-qtver=(qt5/qt6). Only the default value, when the option has not been given at all, needs to differ between the branches.
To make it possible to pass similar configure parameters to both S3_1 and master, replace configure options --with-qt5 (master) and --with-qt6 (S3_1) by uniform --with-qtver=(qt5/qt6). Only the default value, when the option has not been given at all, needs to differ between the branches.