Yes .. both answers are valid ..
but the RP must be valid while outside and not expired .

to extend 6 more months you have to pay 500 Qr .

fill the required form from the net ( www.moi.gov.qa ) and take it to the airport immigration .)