AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

doc: Remove unnecessary qdoc declaration hack

Browse Source 
A special declaration for qdoc was no longer needed.

Change-Id: Ib3486be5c016d57cf09ef89fc8df29045fef0577
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
This commit is contained in:
Martin Smith 2018-01-08 10:43:42 +01:00
parent 0fd0059a13
commit 61f4820c13
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/corelib/global/qglobal.cpp
View File

@ -3268,6 +3268,8 @@ QByteArray qgetenv(const char *varName)
/*!
QString qEnvironmentVariable(const char *varName, const QString &defaultValue);
\relates <QtGlobal>
\since 5.10
@ -3342,6 +3344,9 @@ QString qEnvironmentVariable(const char *varName, const QString &defaultValue)
#endif
}
/*!
\internal
*/
QString qEnvironmentVariable(const char *varName)
{
return qEnvironmentVariable(varName, QString());

6
src/corelib/global/qglobal.h
View File

@ -1134,13 +1134,9 @@ template <typename... Args> Q_CONSTEXPR Q_DECL_UNUSED QNonConstOverload<Args...>
class QByteArray;
Q_CORE_EXPORT QByteArray qgetenv(const char *varName);
#ifdef Q_QDOC
Q_CORE_EXPORT QString qEnvironmentVariable(const char *varName,
const QString &defaultValue = QString());
#else // need it as two functions because QString is only forward-declared here
// need it as two functions because QString is only forward-declared here
Q_CORE_EXPORT QString qEnvironmentVariable(const char *varName);
Q_CORE_EXPORT QString qEnvironmentVariable(const char *varName, const QString &defaultValue);
#endif
Q_CORE_EXPORT bool qputenv(const char *varName, const QByteArray& value);
Q_CORE_EXPORT bool qunsetenv(const char *varName);