Merge "Fix a synchronization problem" into qt-dev