Merge "Fix null pointer with getMin/MaxValue." into qt-dev am: e9c34bb0d5
am: f2e8c377f4

Change-Id: I994cf1e10fb62a1fbb24686e8a33889f44722181