diff options
| author | Martin Smith <martin.smith@qt.io> | 2017-04-05 11:09:49 +0200 |
|---|---|---|
| committer | Martin Smith <martin.smith@qt.io> | 2017-04-05 12:14:47 +0000 |
| commit | 4a67066f146edae05fdcb225026d957a6fdefd78 (patch) | |
| tree | a6fced46b07534ea02e5b53452230297096f90f3 /src/corelib/kernel | |
| parent | b99ec4b4ec7c80f72c65a73ba383f6d9e3f460c8 (diff) | |
doc: Prevent overwrite of qbytearray.html
A use of Q_GLOBAL_STATIC() tricked clangqdoc into
thinking it created something called QByteArray that
should be documented, so the html generator tried to
overwrite qbytearray.html which had already been
created for the real QByteArray. This probably means
there is a bug in the clang visitor class, but I can't
see it, and this change eliminates 4 qdoc errors.
Change-Id: Iee333217212ce60727cd9424a19b8e96a20547b4
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qfunctions_fake_env_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/kernel/qfunctions_fake_env_p.h b/src/corelib/kernel/qfunctions_fake_env_p.h index 16d18c4d88..7010d2cf5d 100644 --- a/src/corelib/kernel/qfunctions_fake_env_p.h +++ b/src/corelib/kernel/qfunctions_fake_env_p.h @@ -77,7 +77,9 @@ struct NameEquals { { return qstrcmp(other.name, name) == 0; } }; +#ifndef Q_CLANG_QDOC Q_GLOBAL_STATIC(QVector<Variable>, qt_app_environment) +#endif errno_t qt_fake_getenv_s(size_t *sizeNeeded, char *buffer, size_t bufferSize, const char *varName) { |