diff options
author | BogDan Vatra <bogdan@kde.org> | 2019-04-22 10:04:22 +0300 |
---|---|---|
committer | BogDan Vatra <bogdan@kdab.com> | 2019-04-25 08:20:22 +0000 |
commit | fc2e9ac7e060bf693f6c4df17e419539f0547878 (patch) | |
tree | a6e67cbb447cab2daa7b5b701655a4a7b8cb08e5 /src/tools | |
parent | 1d128ed1dfbcf49453ada922e54381c37264fde5 (diff) |
Revert "androiddeployqt: Do not check for stdcpp-path in auxiliary mode"
stdcpp-path is needed to set the correct stdc++ library in libs.xml file.
This reverts commit 1366c4f04645d74e83847687adcf61ecfa20b3d2.
Change-Id: I79b398c5d97c1e98bf503ef7b95b2e9f0f18bc11
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/tools')
-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 20b1befc38..45808c4311 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"); |