Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	examples/nfc/corkboard/corkboard.pro

Change-Id: I5d1ea0a8e21a1b55dbf744c2f4b469bc51f05c7a

1 files changed, 5 insertions, 4 deletions

diff --git a/src/nfc/qnearfieldtarget_android.cpp b/src/nfc/qnearfieldtarget_android.cpp
index 0e3836f3..e0c1616d 100644
--- a/src/nfc/qnearfieldtarget_android.cpp
+++ b/src/nfc/qnearfieldtarget_android.cpp
@@ -310,12 +310,12 @@ void NearFieldTarget::checkIsTargetLost()
     QString techStr = m_techList.first();
     QAndroidJniObject tagTech = getTagTechnology(techStr);
     tagTech.callMethod<void>("connect");
-    if (catchJavaExceptions()) {
+    if (catchJavaExceptions(false)) {
         handleTargetLost();
         return;
     }
     tagTech.callMethod<void>("close");
-    if (catchJavaExceptions())
+    if (catchJavaExceptions(false))
         handleTargetLost();
 }
 
@@ -442,11 +442,12 @@ QByteArray NearFieldTarget::jbyteArrayToQByteArray(const jbyteArray &byteArray)
     return resultArray;
 }
 
-bool NearFieldTarget::catchJavaExceptions() const
+bool NearFieldTarget::catchJavaExceptions(bool verbose) const
 {
     QAndroidJniEnvironment env;
     if (env->ExceptionCheck()) {
-        env->ExceptionDescribe();
+        if (verbose)
+            env->ExceptionDescribe();
         env->ExceptionClear();
         return true;
     }