Merge "Optionally trigger CG in onTrimMemory()" into qt-dev