Changing from a Z to a Q1 visa.

I've been living and working in the mainland for several years. This year I opted not to re-sign my contract and my permanent residence is months from expiring. I recently married a Chinese citizen and would like to apply for a Q1 3 year type to stay with her, can I do this in Shanghai or in Hong Kong? or must I return to Australia and apply from there?