Get things compiling on Qt5/10.11 again#6

nopdotcom wants to merge 3 commits intoLittleDuke:masterLittleDuke/2GIVE:masterfrom

nopdotcom:modern-compile-round-3nopdotcom/2GIVE:modern-compile-round-3Copy head branch name to clipboard