diff options
Diffstat (limited to 'src/corelib/io/qprocess.h')
| -rw-r--r-- | src/corelib/io/qprocess.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h index 67c163c012..19157bdd02 100644 --- a/src/corelib/io/qprocess.h +++ b/src/corelib/io/qprocess.h @@ -46,11 +46,13 @@ #include <functional> -QT_REQUIRE_CONFIG(process); +QT_REQUIRE_CONFIG(processenvironment); QT_BEGIN_NAMESPACE -#if !defined(Q_OS_WIN) || defined(Q_QDOC) +class QProcessPrivate; + +#if !defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) typedef qint64 Q_PID; #else QT_END_NAMESPACE @@ -60,7 +62,6 @@ typedef struct _STARTUPINFOW Q_STARTUPINFO; QT_BEGIN_NAMESPACE #endif -class QProcessPrivate; class QProcessEnvironmentPrivate; class Q_CORE_EXPORT QProcessEnvironment @@ -104,6 +105,8 @@ private: Q_DECLARE_SHARED(QProcessEnvironment) +#if QT_CONFIG(process) + class Q_CORE_EXPORT QProcess : public QIODevice { Q_OBJECT @@ -186,7 +189,7 @@ public: void setStandardErrorFile(const QString &fileName, OpenMode mode = Truncate); void setStandardOutputProcess(QProcess *destination); -#if defined(Q_OS_WIN) +#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) QString nativeArguments() const; void setNativeArguments(const QString &arguments); struct CreateProcessArguments @@ -205,7 +208,7 @@ public: typedef std::function<void(CreateProcessArguments *)> CreateProcessArgumentModifier; CreateProcessArgumentModifier createProcessArgumentsModifier() const; void setCreateProcessArgumentsModifier(CreateProcessArgumentModifier modifier); -#endif // Q_OS_WIN +#endif // Q_OS_WIN || Q_CLANG_QDOC QString workingDirectory() const; void setWorkingDirectory(const QString &dir); @@ -297,6 +300,8 @@ private: friend class QProcessManager; }; +#endif // QT_CONFIG(process) + QT_END_NAMESPACE #endif // QPROCESS_H |