Add misssing macros, fix capitalization.

Task-number: QTCREATORBUG-9541

Change-Id: I9e3c3d0f527e444f2f27e5656576bb09d256badc
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>