https://bitcoinmagazine.com/articles/bitcoin-is-not-quantum-safe-and-how-we-can-fix-1375242150
This article is recommending Lamport signatures as the solution, and that wallets need to be able to create 1-of-2 multisignature transactions between an unused, old-style Bitcoin address, and an address generated with the new Lamport scheme.
If this information is correct, then Core needs to develop this Lamport patch. This needs to be done in advance of quantum computing becoming a threat to avoid the centralized trust-based scenario mentioned in the article.