From b9f56751cb926b6b4a6dd8ba2524394dcade9eef Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Wed, 14 Dec 2016 20:13:29 -0800 Subject: Introduce a configure option for QProcessEnvironment This decouples QProcess and QProcessEnvironment, since the latter may actually be available on platforms where the former is not. Change-Id: I3dc799ffdf94486b64143ed01a369897fff44a96 Reviewed-by: Thiago Macieira --- src/corelib/io/qprocess.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/corelib/io/qprocess.cpp') diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index 45f0a0e8c0..f2c2ba4476 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -99,7 +99,7 @@ QT_END_NAMESPACE #include #endif -#ifndef QT_NO_PROCESS +#if QT_CONFIG(processenvironment) QT_BEGIN_NAMESPACE @@ -430,6 +430,10 @@ void QProcessEnvironment::insert(const QProcessEnvironment &e) d->insert(*e.d); } +#endif // QT_CONFIG(processenvironment) + +#if QT_CONFIG(process) + void QProcessPrivate::Channel::clear() { switch (type) { -- cgit v1.2.3