diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-11-25 11:25:34 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-11-25 11:25:34 +0100 |
| commit | 8245523653896e14af588fb2585d5cd76b7f4ba5 (patch) | |
| tree | b67c406590b6e5ce81414f775d9f2f03ab4b802b /src/plugins/boot2qt | |
| parent | 02c876f6e8f3bc26d03a7610901e72568d377a77 (diff) | |
| parent | edef529df6156bfd0461ca91371cabc948d5f34a (diff) | |
Merge remote-tracking branch 'origin/4.14'
Conflicts:
src/plugins/designer/cpp/formclasswizard.h
src/plugins/designer/cpp/formclasswizarddialog.h
Change-Id: I9f9d166e1a9249022305503f9cbe571136c2a2b1
Diffstat (limited to 'src/plugins/boot2qt')
| -rw-r--r-- | src/plugins/boot2qt/qdbmakedefaultappservice.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/boot2qt/qdbmakedefaultappservice.cpp b/src/plugins/boot2qt/qdbmakedefaultappservice.cpp index 9512ac8f7d1..20192d6aad6 100644 --- a/src/plugins/boot2qt/qdbmakedefaultappservice.cpp +++ b/src/plugins/boot2qt/qdbmakedefaultappservice.cpp @@ -74,6 +74,7 @@ void QdbMakeDefaultAppService::handleProcessFinished(const QString &error) return; } + // FIXME: Check that ignoring is fine QByteArray processOutput = d->processRunner->readAllStandardOutput(); if (d->makeDefault) |