diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-15 11:10:09 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-15 11:10:10 +0100 |
| commit | a1808c5dbe2f0e86606de199ab2c965536dc3f53 (patch) | |
| tree | 006386e4f388c0da842b83d671405c7c6d3a8259 /src/tools/androiddeployqt/main.cpp | |
| parent | 9b72613512a36a0ab0ec5d58f0f34016d959a9c1 (diff) | |
| parent | 856fb1ab44722f5165fb6b5dec0bd748006acd10 (diff) | |
| download | qtbase-a1808c5dbe2f0e86606de199ab2c965536dc3f53.tar.gz | |
Merge remote-tracking branch 'origin/5.12.2' into 5.12
Change-Id: I5f9d8090a07056411fb65d7de60eb679d00e99a3
Diffstat (limited to 'src/tools/androiddeployqt/main.cpp')
| -rw-r--r-- | src/tools/androiddeployqt/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index 45808c4311..20b1befc38 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -900,7 +900,7 @@ bool readInputFile(Options *options) options->extraPlugins = extraPlugins.toString().split(QLatin1Char(',')); } - { + if (!options->auxMode) { const QJsonValue stdcppPath = jsonObject.value(QStringLiteral("stdcpp-path")); if (stdcppPath.isUndefined()) { fprintf(stderr, "No stdcpp-path defined in json file.\n"); |