diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2017-03-02 13:25:04 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-09-12 14:23:15 +0000 |
| commit | 4cb8667d20ff9f4af1451c54560ea864630f49b9 (patch) | |
| tree | 800c187243f86e5e655c261ff895f519ffe43bb2 /src/linguist/shared/qmakebuiltins.cpp | |
| parent | 1ace238ce0347857a5ba55d6fa30ba81fed204b9 (diff) | |
Fix problems when building with -no-feature-process
Guard the QProcess includes, modernize some ifdefs, exclude tests and
examples that don't work without processes, and use QT_CONFIG(process)
rather than QT_BOOTSTRAPPED as discriminator where we are actually
checking for QProcess support. Also, don't try to build linguist and
designer without QProcess.
Change-Id: I4e1c7485a96ff02f2f6241113add35e44dc54b1d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/linguist/shared/qmakebuiltins.cpp')
| -rw-r--r-- | src/linguist/shared/qmakebuiltins.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/linguist/shared/qmakebuiltins.cpp b/src/linguist/shared/qmakebuiltins.cpp index 19fc6d639..dde02544d 100644 --- a/src/linguist/shared/qmakebuiltins.cpp +++ b/src/linguist/shared/qmakebuiltins.cpp @@ -435,7 +435,7 @@ QMakeEvaluator::writeFile(const QString &ctx, const QString &fn, QIODevice::Open return ReturnTrue; } -#ifndef QT_BOOTSTRAPPED +#if QT_CONFIG(process) void QMakeEvaluator::runProcess(QProcess *proc, const QString &command) const { proc->setWorkingDirectory(currentDirectory()); @@ -456,7 +456,7 @@ void QMakeEvaluator::runProcess(QProcess *proc, const QString &command) const QByteArray QMakeEvaluator::getCommandOutput(const QString &args, int *exitCode) const { QByteArray out; -#ifndef QT_BOOTSTRAPPED +#if QT_CONFIG(process) QProcess proc; runProcess(&proc, args); *exitCode = (proc.exitStatus() == QProcess::NormalExit) ? proc.exitCode() : -1; @@ -1653,7 +1653,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional( #ifdef PROEVALUATOR_FULL if (m_cumulative) // Anything else would be insanity return ReturnFalse; -#ifndef QT_BOOTSTRAPPED +#if QT_CONFIG(process) QProcess proc; proc.setProcessChannelMode(QProcess::ForwardedChannels); runProcess(&proc, args.at(0).toQString(m_tmp2)); |