Bump version

Change-Id: I4085d699f5475ecc2c8cb0090b2124480bb9f21d
Doc: Fixed broken links caused by "OS X" rename in qtdoc repo.

-article was renamed to use "OS X" from "Mac OS X".

Task-number: QTBUG-40759
Change-Id: I7eb9549883f6ba3be46120e4759e603752a3eb30
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Doc: Changed instances of "Mac OS X" to "OS X".

-the official name is "OS X" and this change is only for
the documentation. Macros and API are untouched by this commit.

Change-Id: Ibdcfe2b8460685a6f8f895548288571dbb6e8a1d
Task-number: QTBUG-40759
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Merge remote-tracking branch 'origin/5.3' into 5.4

Conflicts:
	.qmake.conf

Change-Id: Icabe869a513a8784db00fd388332d723f5379cc1