[automerger skipped] Merge "Operator name modification by pattern add more condition" into qt-dev
am: 9e9eea0d -s ours
am skip reason: change_id Ib43375ffbec4abd76fafd27eb0818469077b10c8 with SHA1 7dbcd480 is in history
Change-Id: Ied9c45086962326d5687a25b9d9b326d68f667b9