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

Conflicts:
	.qmake.conf

Change-Id: I34952065d8370a34e68971d8506dfed385b649cb

.qmake.conf

 load(qt_build_config)
 
-MODULE_VERSION = 5.2.2
+MODULE_VERSION = 5.3.0

translations/check-ts.pl

@@ -45,7 +45,8 @@ use strict;
 
 my @groups = (
     "qtbase", "qtdeclarative", "qtxmlpatterns", "qtmultimedia", "qtscript", "qtquick1",
-#    "qtdocgallery", "qtlocation", "qtpim", "qtsystems",
+    "qtlocation", "qtconnectivity",
+#    "qtdocgallery", "qtpim", "qtsystems",
     "assistant", "designer", "linguist", "qt_help", "qtconfig", "qmlviewer"
 );
 

translations/translations.pro

@@ -50,11 +50,11 @@ addTsTargets(qtxmlpatterns, qtxmlpatterns/src/src.pro)
 #addTsTargets(qtwebkit, qtwebkit/WebKit.pro) # messages from test browser only
 
 #addTsTargets(qt3d, qt3d/src/src.pro)  # empty except one dubious error message
-#addTsTargets(qtconnectivity, qtconnectivity/src/src.pro)  # just 2 error messages
+addTsTargets(qtconnectivity, qtconnectivity/src/src.pro)
 #addTsTargets(qtdocgallery, qtdocgallery/src/src.pro)  # dead module
 #addTsTargets(qtfeedback, qtfeedback/src/src.pro)  # empty
 #addTsTargets(qtjsondb, qtjsondb/src/src.pro)  # dead module, just 3 error messages
-#addTsTargets(qtlocation, qtlocation/src/src.pro)  # not part of 5.0
+addTsTargets(qtlocation, qtlocation/src/src.pro)
 #addTsTargets(qtpim, qtpim/src/src.pro)  # not part of 5.0
 #addTsTargets(qtsensors, qtsensors/src/src.pro) # empty
 #addTsTargets(qtsystems, qtsystems/src/src.pro)  # not part of 5.0