feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Qmake: Show more error if qmake runs but without output

Browse Source 
At the same time, use the more descriptive FilePath::displayName()
instead toUserOutput().

Change-Id: I9bcca84b1f0be025c511b6fbf58c7308c9ffd60f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2022-06-07 15:04:29 +02:00
parent 08952180a1
commit 6aa94e1e17
1 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -190,7 +190,7 @@ public:
static bool queryQMakeVariables(const FilePath &binary, static bool queryQMakeVariables(const FilePath &binary,
const Environment &env, const Environment &env,
QHash<ProKey, ProString> *versionInfo, QHash<ProKey, ProString> *versionInfo,
QString *error = nullptr); QString *error);
enum PropertyVariant { PropertyVariantDev, PropertyVariantGet, PropertyVariantSrc }; enum PropertyVariant { PropertyVariantDev, PropertyVariantGet, PropertyVariantSrc };
QString qmakeProperty(const QByteArray &name, PropertyVariant variant = PropertyVariantGet); QString qmakeProperty(const QByteArray &name, PropertyVariant variant = PropertyVariantGet);
static QString qmakeProperty(const QHash<ProKey, ProString> &versionInfo, static QString qmakeProperty(const QHash<ProKey, ProString> &versionInfo,
@@ -1321,10 +1321,11 @@ void QtVersionPrivate::updateVersionInfo()
m_data.hasExamples = false; m_data.hasExamples = false;
m_data.hasDocumentation = false; m_data.hasDocumentation = false;
if (!queryQMakeVariables(m_qmakeCommand, q->qmakeRunEnvironment(), &m_versionInfo)) { QString error;
if (!queryQMakeVariables(m_qmakeCommand, q->qmakeRunEnvironment(), &m_versionInfo, &error)) {
m_qmakeIsExecutable = false; m_qmakeIsExecutable = false;
qWarning("Cannot update Qt version information: %s cannot be run.", qWarning("Cannot update Qt version information from %s: %s.",
qPrintable(m_qmakeCommand.toString())); qPrintable(m_qmakeCommand.displayName()), qPrintable(error));
return; return;
} }
m_qmakeIsExecutable = true; m_qmakeIsExecutable = true;
@@ -1760,7 +1761,7 @@ Tasks QtVersion::reportIssuesImpl(const QString &proFile, const QString &buildDi
if (!qmake.isExecutableFile()) { if (!qmake.isExecutableFile()) {
//: %1: Path to qmake executable //: %1: Path to qmake executable
const QString msg = QCoreApplication::translate("QmakeProjectManager::QtVersion", const QString msg = QCoreApplication::translate("QmakeProjectManager::QtVersion",
"The qmake command \"%1\" was not found or is not executable.").arg(qmake.toUserOutput()); "The qmake command \"%1\" was not found or is not executable.").arg(qmake.displayName());
results.append(BuildSystemTask(Task::Error, msg)); results.append(BuildSystemTask(Task::Error, msg));
} }
@@ -1799,21 +1800,31 @@ static QByteArray runQmakeQuery(const FilePath &binary, const Environment &env,
process.start(); process.start();
if (!process.waitForStarted()) { if (!process.waitForStarted()) {
*error = QCoreApplication::translate("QtVersion", "Cannot start \"%1\": %2").arg(binary.toUserOutput()).arg(process.errorString()); *error = QCoreApplication::translate("QtVersion", "Cannot start \"%1\": %2")
return QByteArray(); .arg(binary.displayName()).arg(process.errorString());
return {};
} }
if (!process.waitForFinished(timeOutMS)) { if (!process.waitForFinished(timeOutMS)) {
process.stopProcess(); process.stopProcess();
*error = QCoreApplication::translate("QtVersion", "Timeout running \"%1\" (%2 ms).").arg(binary.toUserOutput()).arg(timeOutMS); *error = QCoreApplication::translate("QtVersion", "Timeout running \"%1\" (%2 ms).")
return QByteArray(); .arg(binary.displayName()).arg(timeOutMS);
return {};
} }
if (process.exitStatus() != QProcess::NormalExit) { if (process.exitStatus() != QProcess::NormalExit) {
*error = QCoreApplication::translate("QtVersion", "\"%1\" crashed.").arg(binary.toUserOutput()); *error = QCoreApplication::translate("QtVersion", "\"%1\" crashed.")
return QByteArray(); .arg(binary.displayName());
return {};
}
const QByteArray out = process.readAllStandardOutput();
if (out.isEmpty()) {
*error = QCoreApplication::translate("QtVersion", "\"%1\" produced no output: %2.")
.arg(binary.displayName(), process.stdErr());
return {};
} }
error->clear(); error->clear();
return process.readAllStandardOutput(); return out;
} }
bool QtVersionPrivate::queryQMakeVariables(const FilePath &binary, const Environment &env, bool QtVersionPrivate::queryQMakeVariables(const FilePath &binary, const Environment &env,
@@ -1824,7 +1835,8 @@ bool QtVersionPrivate::queryQMakeVariables(const FilePath &binary, const Environ
error = &tmp; error = &tmp;
if (!binary.isExecutableFile()) { if (!binary.isExecutableFile()) {
*error = QCoreApplication::translate("QtVersion", "qmake \"%1\" is not an executable.").arg(binary.toUserOutput()); *error = QCoreApplication::translate("QtVersion", "qmake \"%1\" is not an executable.")
.arg(binary.displayName());
return false; return false;
} }
@@ -1837,7 +1849,7 @@ bool QtVersionPrivate::queryQMakeVariables(const FilePath &binary, const Environ
// starting container process caused: exec: "/bin/qmake": stat /bin/qmake: no such file or directory" // starting container process caused: exec: "/bin/qmake": stat /bin/qmake: no such file or directory"
// Since we have a rough idea on what the output looks like we can work around this. // Since we have a rough idea on what the output looks like we can work around this.
// Output does not always start with QT_SYSROOT, see QTCREATORBUG-26123. // Output does not always start with QT_SYSROOT, see QTCREATORBUG-26123.
*error = QString::fromUtf8(output); *error += QString::fromUtf8(output);
return false; return false;
} }
@@ -2367,7 +2379,7 @@ QtVersion *QtVersionFactory::createQtVersionFromQMakePath
ProFileCacheManager::instance()->decRefCount(); ProFileCacheManager::instance()->decRefCount();
if (error) { if (error) {
*error = QCoreApplication::translate("QtSupport::QtVersionFactory", *error = QCoreApplication::translate("QtSupport::QtVersionFactory",
"No factory found for qmake: \"%1\"").arg(qmakePath.toUserOutput()); "No factory found for qmake: \"%1\"").arg(qmakePath.displayName());
} }
return nullptr; return nullptr;
} }