Yes you can convert your Saudi License with a Qatari License without a test, infact you would have to undergo an Eye Test only.
Regarding surrendering your Saudi License, The Traffic Police Deptt normally keeps it with them, but then all it depends on "WASTA". If you have any "WASTA", you can keep your Saudi License with you.