You are correct. Q never has mentioned Gitmo or Guantanamo. He said we have a special place picked out for GS and "Special Place" was confirmed multiple times by POTUS himself as Camp David.
Only our wonderful planefags have been monitoring flights in and out of Gitmo because we know only non-US citizens enemy combatants can be detained at Gitmo.