diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-03 10:44:24 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-05-03 10:44:24 +0200 |
| commit | b5c2535eb0da4ad2b65e79df288a3674f3118717 (patch) | |
| tree | 964bd1dfaa9c769878f8195db6d2bce03ef4e5c7 /src/tools | |
| parent | 3f25bcd5b7ec0d8a17a3a236099b9049b32b7755 (diff) | |
| parent | 6c0ced4b7a77b089b434ab5eb9f430717f26d687 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/3rdparty/pcre2/qt_attribution.json
Change-Id: Ibae941cb12662f27bd6962ee02bc235971c59a15
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/androiddeployqt/main.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index fd7f72eebf..c9a5e9e260 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -2898,6 +2898,8 @@ int main(int argc, char *argv[]) return CannotCopyQtFiles; if (!copyAndroidExtraResources(options)) return CannotCopyAndroidExtraResources; + if (!copyAndroidExtraLibs(options)) + return CannotCopyAndroidExtraLibs; if (!stripLibraries(options)) return CannotStripLibraries; if (!updateAndroidFiles(options)) |