diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2022-10-04 15:21:56 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2022-10-04 13:44:42 +0000 |
| commit | 964f539e559f0bb51204a10ad6147bda3a1924d0 (patch) | |
| tree | 056b43eeec5ea5cb4aac35fc6476089906ce5d21 /src/plugins/android/androiddeployqtstep.cpp | |
| parent | 993fd2a92a9e90c9e06f161b40eb5b0201169ade (diff) | |
| parent | 47887da778215045831d8284cf896e8934e75cda (diff) | |
Merge remote-tracking branch 'origin/8.0' into 9.0
resolved conflicts:
* doc/qtdesignstudio/src/developers/studio-designer-developer-workflow.qdoc
* src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
* src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
* src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp
and compile fix in materialbrowserview.cpp
Change-Id: I686e7e93ded8ac1afc792942ded47cd9fe4341ed
Diffstat (limited to 'src/plugins/android/androiddeployqtstep.cpp')
| -rw-r--r-- | src/plugins/android/androiddeployqtstep.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 03795b4d34..128de01afe 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -240,6 +240,9 @@ bool AndroidDeployQtStep::init() m_androiddeployqtArgs.addArg("--gradle"); + if (buildType() == BuildConfiguration::Release) + m_androiddeployqtArgs.addArgs({"--release"}); + if (androidBuildApkStep && androidBuildApkStep->signPackage()) { // The androiddeployqt tool is not really written to do stand-alone installations. // This hack forces it to use the correct filename for the apk file when installing |