Iran war: Trump says its over

US President Donald Trump says the Iran war is effectively over after talks with Qatar, and he wants a long-term plan to limit Irans nuclear programme.