androiddeployqt: Fix debug deployment on Windows
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Thu, 27 Feb 2014 11:21:00 +0000 (12:21 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 27 Feb 2014 14:40:44 +0000 (15:40 +0100)
There is a bug in "adb push" which makes it fail when the input
directory ends with a slash on Windows. This made it impossible
to use the debug deployment method on Windows.

[ChangeLog][Android][androiddeployqt] Fixed debug deployment on
Windows.

Task-number: QTBUG-37028
Change-Id: I99bef5f2dc879cbd08dc0c7e6765395095b264cf
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
src/androiddeployqt/main.cpp

index 058cdd2..3a831a0 100644 (file)
@@ -2003,7 +2003,7 @@ bool deployAllToLocalTmp(const Options &options)
 {
     FILE *adbCommand = runAdb(options,
                               QString::fromLatin1(" push %1 /data/local/tmp/qt/")
-                              .arg(options.temporaryDirectoryName + QLatin1Char('/')));
+                              .arg(options.temporaryDirectoryName));
     if (adbCommand == 0)
         return false;