Right after thiago announced qt-copy had upgraded to rc1, I updated. Learn from my mistakes. Don't update without reverting everything (./apply-patches changes stuff, duh!). Also don't try to just make from your build folder, clean out your build folder first, and rerun configure.
Not sure why I was so braindead thismorning, but thought I'd share the wisdom of hindsight so you don't follow and make the same mistakes I did ;)