You actually have a very short time to change your licence. Something like 10 days from receivng your Qatari ID. Go to traffic department, and see if your national license is convertible. If not you'll have to take the test...or convince a big boss over there not to take it.