The links below may help. Many Qataris do not know the law changed in 2009 for expats, they are working to the 2004 law.

http://www.almeezan.qa/LawPage.aspx?id=2611&language=en

This link is relevant to the time an expat has to leave the country, see article 11, many Qataris believe they can get rid of you straight away, article 11 clearly states it is 90 days.

http://www.almeezan.qa/LawArticles.aspx?LawTreeSectionID=9696&lawId=2611...

I hope some of this new law assists you.