diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-20 10:56:29 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-03-20 10:56:29 +0000 |
| commit | dd613e65eaa4863ba987eb5e9efeff54d25cdd63 (patch) | |
| tree | 3af240c4d9f0e2a8e68beab3a97a90b89e2a18d0 /src/corelib/io/qprocess.h | |
| parent | 62c7ca2de3fb996893fe993abb69182eb642a314 (diff) | |
| parent | ae2695535a2f1abbd4c6596a22dd33319b9388dd (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/io/qprocess.h')
| -rw-r--r-- | src/corelib/io/qprocess.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h index 37e71aef5d..19157bdd02 100644 --- a/src/corelib/io/qprocess.h +++ b/src/corelib/io/qprocess.h @@ -46,12 +46,12 @@ #include <functional> +QT_REQUIRE_CONFIG(processenvironment); + QT_BEGIN_NAMESPACE class QProcessPrivate; -#if QT_CONFIG(processenvironment) - #if !defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) typedef qint64 Q_PID; #else @@ -105,8 +105,6 @@ private: Q_DECLARE_SHARED(QProcessEnvironment) -#endif // QT_CONFIG(processenvironment) - #if QT_CONFIG(process) class Q_CORE_EXPORT QProcess : public QIODevice @@ -302,7 +300,7 @@ private: friend class QProcessManager; }; -#endif // QT_NO_PROCESS +#endif // QT_CONFIG(process) QT_END_NAMESPACE |