diff options
| author | Raphaël Cotty <raphael.cotty@gmail.com> | 2020-10-13 15:38:08 +0200 |
|---|---|---|
| committer | Raphaël Cotty <raphael.cotty@gmail.com> | 2020-10-21 07:40:09 +0000 |
| commit | 2f5f049ecf777bcfcbfe4a17af72768248f73eab (patch) | |
| tree | 9e3d27c2a21c37e16de52c89db9b367cb2c76fd4 /src | |
| parent | eb7adb8d9787dddef89e46f7bf6e594d0b5faf4b (diff) | |
Android: Update for Qt 5.15
Use java.additionalClassPaths property to allow compilation of binding classes
because starting with Qt 5.15 they depend on QtAndroid.jar
Update AndroidManifest.xml with uses-sdk node using new properties Android.sdk.minVersion
and Android.sdk.targetVersion because Qt 5.15 uses androiddeployqt to set it.
Fixes: QBS-1580
Change-Id: I2fa5e77bb183be1b55e9dd9756fb7b6eb1f3c9d4
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/corelib/jsextensions/process.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/corelib/jsextensions/process.cpp b/src/lib/corelib/jsextensions/process.cpp index 064297a32..a91084b4a 100644 --- a/src/lib/corelib/jsextensions/process.cpp +++ b/src/lib/corelib/jsextensions/process.cpp @@ -213,8 +213,8 @@ int Process::exec(const QString &program, const QStringList &arguments, bool thr } else if (m_qProcess->exitStatus() == QProcess::CrashExit || m_qProcess->exitCode() != 0) { QString errorMessage = m_qProcess->error() == QProcess::Crashed ? Tr::tr("Error running '%1': %2").arg(program, m_qProcess->errorString()) - : Tr::tr("Process '%1' finished with exit code %2.").arg(program).arg( - m_qProcess->exitCode()); + : Tr::tr("Process '%1 %2' finished with exit code %3.").arg(program). + arg(arguments.join(QStringLiteral(" "))).arg(m_qProcess->exitCode()); const QString stdOut = readStdOut(); if (!stdOut.isEmpty()) errorMessage.append(Tr::tr(" The standard output was:\n")).append(stdOut); |