Great that whale sharks are in Qatar. I would just love to see a dugong - that's something I've never seen before. However I did see a whale shark diving last summer in Musandam. I've got videos here:

http://www.youtube.com/watch?v=dt7ZV6jN8L4

http://www.youtube.com/watch?v=CDZOIRyE5LY

And as for previous questions about whale sharks being dangerous you've got a better chance of being nibbled to death by a goldfish than being harmed by a whale shark. Great whites or makos on the other hand... well if u see a whale shark while swimming like in the videos above, consider yourself one lucky individual. If u see a great white like the ones in the video below... well then, get out of the water ASAP...

http://www.youtube.com/watch?v=HzcxvEDfMzc

but fortunately that was taken in Cape Town though....