diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-12-14 20:13:29 -0800 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-12-16 09:14:24 +0000 |
| commit | b9f56751cb926b6b4a6dd8ba2524394dcade9eef (patch) | |
| tree | 9450b9d32941f470d51d02980c75b32cae6121b6 /src/corelib/io/qprocess.cpp | |
| parent | 66c2b87547e29a8c31377b6cac959a7d3bd6076b (diff) | |
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 <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qprocess.cpp')
| -rw-r--r-- | src/corelib/io/qprocess.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
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 <private/qcore_unix_p.h> #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) { |