aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Mikolajczyk <piotr.mikolajczyk@qt.io>2021-11-05 12:43:12 +0100
committerPiotr Mikolajczyk <piotr.mikolajczyk@qt.io>2021-11-10 09:51:14 +0000
commitf45e68d28d9f2cf1f4f74c51d6e03b8eadbfff1a (patch)
treee2e7ad34c28651a4af0f24064f68c7af2bdfefc2
parent96f60fa123c38a28ac1855194aa83084c370fc0b (diff)
Fix to qmlpreview failing to upload files
Return to correct function call order when preparing and uploading data to the device. (Manual pick from master) Change-Id: I0a78b6614765bfae5c3accd99c1c150540871aac Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
-rw-r--r--src/plugins/android/androidqmlpreviewworker.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/android/androidqmlpreviewworker.cpp b/src/plugins/android/androidqmlpreviewworker.cpp
index bb95616eac..5eb0c887d7 100644
--- a/src/plugins/android/androidqmlpreviewworker.cpp
+++ b/src/plugins/android/androidqmlpreviewworker.cpp
@@ -209,8 +209,8 @@ void AndroidQmlPreviewWorker::start()
}
const bool previewStarted = ensureAvdIsRunning()
&& checkAndInstallPreviewApp()
- && uploadPreviewArtefacts()
&& preparePreviewArtefacts()
+ && uploadPreviewArtefacts()
&& startPreviewApp();
previewStarted ? reportStarted() : reportStopped();