From c306663990ba86814717b1edc770ddd221fce722 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 15 Mar 2019 09:38:03 +0100 Subject: Fix qdoc errors in QProcess header Split apart the #ifdef so that qdoc on non-Windows systems sees Q_SECURITY_ATTRIBUTES and Q_STARTUPINFO, fixing: LOG Build & visit PCH for QtCore src/corelib/io/qprocess.h:204:9: error: unknown type name 'Q_SECURITY_ATTRIBUTES' src/corelib/io/qprocess.h:205:9: error: unknown type name 'Q_SECURITY_ATTRIBUTES' src/corelib/io/qprocess.h:210:9: error: unknown type name 'Q_STARTUPINFO' Change-Id: I50b4ee6113da4cd49b6b08b84e6e6590438c5573 Reviewed-by: Paul Wicking --- src/corelib/io/qprocess.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h index 42cf769698..a2e3c01f7c 100644 --- a/src/corelib/io/qprocess.h +++ b/src/corelib/io/qprocess.h @@ -48,22 +48,24 @@ QT_REQUIRE_CONFIG(processenvironment); -QT_BEGIN_NAMESPACE - -class QProcessPrivate; - -#if !defined(Q_OS_WIN) -typedef qint64 Q_PID; -#else -QT_END_NAMESPACE +#ifdef Q_OS_WIN typedef struct _PROCESS_INFORMATION *Q_PID; +#endif + +#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) typedef struct _SECURITY_ATTRIBUTES Q_SECURITY_ATTRIBUTES; typedef struct _STARTUPINFOW Q_STARTUPINFO; -QT_BEGIN_NAMESPACE #endif +QT_BEGIN_NAMESPACE + +class QProcessPrivate; class QProcessEnvironmentPrivate; +#ifndef Q_OS_WIN +typedef qint64 Q_PID; +#endif + class Q_CORE_EXPORT QProcessEnvironment { public: -- cgit v1.2.3