qmake: Check for QT_CONFIG(process) in qmakebuiltins
The code in question is obviously checking for support of QProcess, not for general bootstrap mode. You can manually disable QProcess, in which case it is still not available after bootstrapping is done. Change-Id: Ia99810b8900621911a31912034358a01af4f18a0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
parent
8a1880029d
commit
c925400bde
@ -469,7 +469,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());
|
||||
@ -490,7 +490,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;
|
||||
@ -1711,7 +1711,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));
|
||||
|
@ -44,7 +44,7 @@
|
||||
#include <qstring.h>
|
||||
#include <qstringlist.h>
|
||||
#include <qshareddata.h>
|
||||
#ifndef QT_BOOTSTRAPPED
|
||||
#if QT_CONFIG(process)
|
||||
# include <qprocess.h>
|
||||
#else
|
||||
# include <qiodevice.h>
|
||||
@ -237,7 +237,7 @@ public:
|
||||
|
||||
VisitReturn writeFile(const QString &ctx, const QString &fn, QIODevice::OpenMode mode,
|
||||
bool exe, const QString &contents);
|
||||
#ifndef QT_BOOTSTRAPPED
|
||||
#if QT_CONFIG(process)
|
||||
void runProcess(QProcess *proc, const QString &command) const;
|
||||
#endif
|
||||
QByteArray getCommandOutput(const QString &args, int *exitCode) const;
|
||||
|
Loading…
x
Reference in New Issue
Block a user