Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I580d8758366a6d225391b4bb7a2a3d37c8dca196
Bump qtxmlpatterns version to 5.3.0

Change-Id: Ie230ae86d664542b1ce98a50c967460373ebafda
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I4e5b26b796b12ced8a62926cdf91da10b9c20f9e
Merge branch 'stable' into dev

Change-Id: Icbade3b8a1098b442dccb04c85c597e9c7adc423
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Icd0bc0b31f6c925850d6773ec1000afc9a702d36
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I5040e8925ebcf73b353abd3b3e91f9603a086c49
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ib71b7f22be969dae2e1f4bfc20bc8d5478679e5c
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I028af77ed75b91c721ec3e20eccca49e30fbd495
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	.qmake.conf

Change-Id: I0b0d5044d34bc915614253e89fb6029d6bfb75f7
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I914a08f02d1bca4402a7c29dd4aedb77c99f6d02
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I918b255b204a5246fa9cdc9ed3f8c7d71ab01e35
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I220517794f3427f9f1746981e8dc7256bb482285
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	.qmake.conf

Change-Id: I8a745d75ab994164aa861f5d5082e493b02eaea4
whitespace fixes

remove trailing spaces & expand tabs

Change-Id: Ic958087d8c50f3c51d767f5191e54c4079cc74a2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Compile fix for WinRT

Change-Id: I1c9a9027ac4a592aaf6f34450ab6fbcf3224e47f
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
test: Don't fail *all* tests if the network test server is not set up

Since not all tests for tst_qxmlquery and tst_xmlpatterns depend on
the network test server being set up, now we just fail those which
really depend on it allowing the rest to be normally run.

Change-Id: I0588cf986ffddea117cee680e07e1a8cc4d68436
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I60405f79dbe590e2f598d57f80794364f415c566