Merge "Remove STOPSHIP (disable debug flag) in WatchDog.java" into qt-dev