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

 Conflicts:
	mkspecs/features/qt_common.prf
	src/corelib/tools/qstring.cpp
	src/plugins/platforms/windows/qwindowsmousehandler.cpp
	src/widgets/widgets/qmainwindowlayout_p.h

Change-Id: I5df613008f6336f69b257d08e49a133d033a9d65

1 files changed, 10 insertions, 5 deletions

diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java b/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java
index 531802959c..fc3d7e04ce 100644
--- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java
+++ b/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java
@@ -361,7 +361,7 @@ public abstract class QtLoader {
             inputStream = assetsManager.open(source);
             outputStream = new FileOutputStream(destinationFile);
             copyFile(inputStream, outputStream);
-        catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         } finally {
             if (inputStream != null)
@@ -392,7 +392,7 @@ public abstract class QtLoader {
             inputStream = new FileInputStream(source);
             outputStream = new FileOutputStream(destinationFile);
             copyFile(inputStream, outputStream);
-        catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         } finally {
             if (inputStream != null)
@@ -416,8 +416,13 @@ public abstract class QtLoader {
             } catch (Exception e) {
                 e.printStackTrace();
             } finally {
-                if (inputStream != null)
-                    inputStream.close();
+                if (inputStream != null) {
+                    try {
+                        inputStream.close();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
             }
         }
 
@@ -456,7 +461,7 @@ public abstract class QtLoader {
             try {
                 outputStream = new DataOutputStream(new FileOutputStream(versionFile));
                 outputStream.writeLong(packageVersion);
-            catch (Exception e) {
+            } catch (Exception e) {
                 e.printStackTrace();
             } finally {
                 if (outputStream != null)