diff options
| author | Martin Smith <martin.smith@qt.io> | 2018-01-08 10:43:42 +0100 |
|---|---|---|
| committer | Martin Smith <martin.smith@qt.io> | 2018-01-09 06:39:21 +0000 |
| commit | 61f4820c13fff05c82ae7d7775a7c32eef815982 (patch) | |
| tree | 8949ca949bbf3d9b22b7ddae6ec75cca4517abd7 | |
| parent | 0fd0059a1328723199641ced96f0c4b98e44e9d9 (diff) | |
| download | qtbase-61f4820c13fff05c82ae7d7775a7c32eef815982.tar.gz | |
doc: Remove unnecessary qdoc declaration hack
A special declaration for qdoc was no longer needed.
Change-Id: Ib3486be5c016d57cf09ef89fc8df29045fef0577
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 5 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index d37ccc9253..c6197660e7 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -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()); diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 224288a1d4..c7d5c957ea 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -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); |