No need to panic. My son s passport is expiring this May, yet he still used it to travel to France last March and returned to Qatar this April. Yes now, IT MUST BE RENEWED!

I gather you are a returning resident to Qatar so that should not pose a problem at entry.