Merge remote-tracking branch 'origin/5.3' into 5.4

Conflicts:
	src/script/script.pro

Change-Id: Id2abbacef830a9b553c269af907e12f2c10f8b40

src/scripttools/scripttools.pro

+load(qfeatures)
+requires(!contains(QT_DISABLED_FEATURES, textedit))
+
 TARGET     = QtScriptTools
 QT         = core-private
 QT_PRIVATE = gui widgets-private script