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_p.h | |
| 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_p.h')
| -rw-r--r-- | src/corelib/io/qprocess_p.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/corelib/io/qprocess_p.h b/src/corelib/io/qprocess_p.h index ae236c8c60..92b747f6ba 100644 --- a/src/corelib/io/qprocess_p.h +++ b/src/corelib/io/qprocess_p.h @@ -70,8 +70,6 @@ typedef int Q_PIPE; #define INVALID_Q_PIPE -1 #endif -#ifndef QT_NO_PROCESS - QT_BEGIN_NAMESPACE class QSocketNotifier; @@ -80,6 +78,8 @@ class QWindowsPipeWriter; class QWinEventNotifier; class QTimer; +#if QT_CONFIG(processenvironment) + #ifdef Q_OS_WIN class QProcEnvKey : public QString { @@ -233,6 +233,10 @@ template<> Q_INLINE_TEMPLATE void QSharedDataPointer<QProcessEnvironmentPrivate> d = x; } +#endif // QT_CONFIG(processenvironment) + +#if QT_CONFIG(process) + class QProcessPrivate : public QIODevicePrivate { public: @@ -386,8 +390,8 @@ public: void setErrorAndEmit(QProcess::ProcessError error, const QString &description = QString()); }; -QT_END_NAMESPACE - #endif // QT_NO_PROCESS +QT_END_NAMESPACE + #endif // QPROCESS_P_H |