Merge "Delete unused timeout constant." into qt-dev