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_p.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/corelib/io/qprocess_p.h') 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 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 -- cgit v1.2.3