whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

doc: make Q_OS_WIN code available to qdoc 

Some declarations in QProcess are declared only
for Windows. This change uses the Q_CLANG_QDOC
macro so that #if defined(Q_OS_WIN) becomes
This ensures that Windows-specific documentation
always gets generated. The macro is added in
both .h and .cpp files.

Change-Id: I632fc52d010cd7c0399fd191f44cbacf6ed25aff
Reviewed-by: Martin Smith <martin.smith@qt.io>
bb10
Martin Smith 2016-10-21 10:17:48 +02:00
parent bf2af6af68
commit 128748d6fe
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/io/qprocess.cpp
View File

@ -1526,7 +1526,7 @@ void QProcess::setStandardOutputProcess(QProcess *destination)
dto->stdinChannel.pipeFrom(dfrom);
}
#if defined(Q_OS_WIN)
#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC)
/*!
\since 4.7

6
src/corelib/io/qprocess.h
View File

@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
#ifndef QT_NO_PROCESS
#if !defined(Q_OS_WIN) || defined(Q_QDOC)
#if !defined(Q_OS_WIN) || defined(Q_CLANG_QDOC)
typedef qint64 Q_PID;
#else
QT_END_NAMESPACE
@ -187,7 +187,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
@ -206,7 +206,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);