If you look on the peninsula website, there is the latest copy of the labour law it is included in there.
Everything you have indicated is correct, however you will find that most Qatari's will only be working 5 hours flexi time, so as to meet their needs whilst fasting.

http://www.thepeninsulaqatar.com/law.asp?section=Local_News&month=May200...