Preliminary merge. Integration is brancehd from fresh master.
[situare] / src / ui / updatelocation / texteditautoresizer.h