The Scotch Whisky Association has capped a high-level trade trip to China with a deal that renews the trademark for Scotch in the country.