Merge tag 'upstream/3.1.1+dfsg1'

Upstream version 3.1.1+dfsg1

# gpg: Signature made Thu 09 Feb 2017 04:37:24 AM EST
# gpg:                using RSA key 5001E1B09AA3744B
# gpg:                issuer "unit193@ubuntu.com"
# gpg: Good signature from "Unit 193 <unit193@ubuntu.com>" [unknown]
# gpg:                 aka "Unit 193 <unit193@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8DB3 E586 865D 2B4A 2B18  5A5C 5001 E1B0 9AA3 744B

1 files changed, 2 insertions, 1 deletions

diff --git a/Plugins/DbAndroid/dbandroidshellconnection.h b/Plugins/DbAndroid/dbandroidshellconnection.h
index 1c0ae0f..205d9bb 100644
--- a/Plugins/DbAndroid/dbandroidshellconnection.h
+++ b/Plugins/DbAndroid/dbandroidshellconnection.h
@@ -14,7 +14,7 @@ class DbAndroidShellConnection : public DbAndroidConnection
         Q_OBJECT
 
     public:
-        DbAndroidShellConnection(DbAndroid* plugin, QObject *parent = 0);
+        DbAndroidShellConnection(DbAndroid* plugin, const QString &deviceName, QObject *parent = 0);
         ~DbAndroidShellConnection();
 
         bool connectToAndroid(const DbAndroidUrl& url);
@@ -49,6 +49,7 @@ class DbAndroidShellConnection : public DbAndroidConnection
         DbAndroidUrl connectionUrl;
         bool appOkay = false;
         mutable QMutex appOkMutex;
+        QString creationDeviceName;
 
         static const CsvFormat CSV_FORMAT;