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.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.h')
| -rw-r--r-- | src/corelib/io/qprocess.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h index 75a0bac2ed..37e71aef5d 100644 --- a/src/corelib/io/qprocess.h +++ b/src/corelib/io/qprocess.h @@ -48,8 +48,9 @@ QT_BEGIN_NAMESPACE +class QProcessPrivate; -#ifndef QT_NO_PROCESS +#if QT_CONFIG(processenvironment) #if !defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) typedef qint64 Q_PID; @@ -61,7 +62,6 @@ typedef struct _STARTUPINFOW Q_STARTUPINFO; QT_BEGIN_NAMESPACE #endif -class QProcessPrivate; class QProcessEnvironmentPrivate; class Q_CORE_EXPORT QProcessEnvironment @@ -105,6 +105,10 @@ private: Q_DECLARE_SHARED(QProcessEnvironment) +#endif // QT_CONFIG(processenvironment) + +#if QT_CONFIG(process) + class Q_CORE_EXPORT QProcess : public QIODevice { Q_OBJECT |