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

Manually adjusted src/androiddeployqt/main.cpp
after 73e4f9593abecad68b39bbf68564a92dff5222e6
Patch by BogDan Vatra.

Change-Id: Idcf4ae7f54346119ee09001b1b55225a08dd9b21

diff --cc src/androiddeployqt/main.cpp
index 8caf8e9,6c5ae31..64a1fd0
--- 1/src/androiddeployqt/main.cpp
--- 2/src/androiddeployqt/main.cpp
+++ b/src/androiddeployqt/main.cpp
@@@ -1460,6 -1372,17 +1468,18 @@@ bool readDependencies(Options *options
      if (!readDependenciesFromElf(options, options->applicationBinary, &usedDependencies, &remainingDependencies))
          return false;
  
 -    if (!options->qtDependencies.contains(guiLib)) {
 -        options->qtDependencies.append(guiLib);
+     // Until we have support non-gui applications on Android, always add Qt Gui
+     // as a dependency (otherwise the platform plugin cannot be deployed, and
+     // the application will not run).
+     QLatin1String guiLib("lib/libQt5Gui.so");
++    if (!usedDependencies.contains(guiLib)) {
++        QtDependency dep(guiLib, options->qtInstallDirectory + QLatin1Char('/') + guiLib);
++        options->qtDependencies.append(dep);
+         usedDependencies.insert(guiLib);
+         if (!readAndroidDependencyXml(options, QLatin1String("Qt5Gui"), &usedDependencies, &remainingDependencies))
+             return false;
+     }
+ 
      QString qtDir = options->qtInstallDirectory + QLatin1Char('/');
  
      while (!remainingDependencies.isEmpty()) {

diff --cc src/macdeployqt/shared/shared.cpp
Simple merge