build with QT_NO_TEXTEDIT

Change-Id: I0c7ee38cf12de991e23c7259e65f2eaa7c8f7045
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Don't disable C++11 on Mac OS X

On OS X, enabling C++11 has the side effect of switching
the standard library from libstdc++ to libc++. Qt 5.2
enables C++11 by default, which leads to a Qt build
that uses both standard libraries. This is something
we would like to avoid.

Change-Id: I0ad8fb550ef79ac37ac97a75799ac38aa19d39d4
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Merge remote-tracking branch 'origin/5.3' into 5.4

Conflicts:
	src/script/script.pro

Change-Id: Id2abbacef830a9b553c269af907e12f2c10f8b40
Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I96839d57e1ecef10402898abb7d0a3236ff14fba