Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-systeminfo into master-integration

* 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-systeminfo:
  Fix QAudioInput to connect to correct slot on Symbian
  Fix for Symbian video resume from pause after screen lock and unlock
  Fix handling of type 4 tag specific command replies on Symbian

1 files changed, 5 insertions, 0 deletions

diff --git a/src/connectivity/nfc/qnearfieldtagtype4_symbian.cpp b/src/connectivity/nfc/qnearfieldtagtype4_symbian.cpp
index 4df5539b1d..5e93782c9f 100644
--- a/src/connectivity/nfc/qnearfieldtagtype4_symbian.cpp
+++ b/src/connectivity/nfc/qnearfieldtagtype4_symbian.cpp
@@ -134,6 +134,11 @@ QVariant QNearFieldTagType4Symbian::decodeResponse(const QByteArray &command, co
             result = response;
         }
     }
+    else
+    {
+        LOG("tag specific command");
+        result = response;
+    }
     END
     return result;
 }