Merge "Fixed Infinite loop method call." into qt-dev