Reworking of WITH_QSCIAPI