diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-07 10:52:53 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-05-07 13:28:29 +0000 |
| commit | 35b25bc91784f5a39ee034a99167d5bfee49f74b (patch) | |
| tree | f6198a2b9f4456c05f3399d60e95da57499b0036 /src/tools/androiddeployqt/main.cpp | |
| parent | aea6ff4f57135b0f2f076e86e22cb87c0a7014fe (diff) | |
| parent | c2b553784dfbe0ece90f79709639e27e74359a7d (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev" into refs/staging/dev
Diffstat (limited to 'src/tools/androiddeployqt/main.cpp')
| -rw-r--r-- | src/tools/androiddeployqt/main.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index fd7f72eebf1..01c392f8f96 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -1730,6 +1730,11 @@ bool scanImports(Options *options, QSet<QString> *usedDependencies) .arg(shellQuote(rootPath)) .arg(importPaths.join(QLatin1Char(' '))); + if (options->verbose) { + fprintf(stdout, "Running qmlimportscanner with the following command: %s\n", + qmlImportScanner.toLocal8Bit().constData()); + } + FILE *qmlImportScannerCommand = popen(qmlImportScanner.toLocal8Bit().constData(), QT_POPEN_READ); if (qmlImportScannerCommand == 0) { fprintf(stderr, "Couldn't run qmlimportscanner.\n"); @@ -2898,6 +2903,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)) |