diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-22 10:12:13 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-22 10:12:14 +0200 |
commit | 95cd9078938bcd88fdfbba707911e8111f59f195 (patch) | |
tree | c55231a843255c0e8fa7d6c94fbf54bc1a9bb9a7 /src/qdoc/config.h | |
parent | 1b992406a6523a144c58baa9bbd1198bb9a2d98c (diff) | |
parent | b3cdd63d4bdaea09222fb93ffcd5104a2dc0bf2e (diff) |
Merge remote-tracking branch 'origin/5.15' into 5.15.0
Change-Id: I1fdd80c6b7c2615815acc262f01a3893d28406a3
Diffstat (limited to 'src/qdoc/config.h')
-rw-r--r-- | src/qdoc/config.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/qdoc/config.h b/src/qdoc/config.h index f8823d521..933aad543 100644 --- a/src/qdoc/config.h +++ b/src/qdoc/config.h @@ -228,7 +228,6 @@ struct ConfigStrings static QString DEPENDS; static QString DESCRIPTION; static QString DOCBOOKEXTENSIONS; - static QString EDITION; static QString ENDHEADER; static QString EXAMPLEDIRS; static QString EXAMPLES; @@ -315,7 +314,6 @@ struct ConfigStrings #define CONFIG_DEPENDS ConfigStrings::DEPENDS #define CONFIG_DESCRIPTION ConfigStrings::DESCRIPTION #define CONFIG_DOCBOOKEXTENSIONS ConfigStrings::DOCBOOKEXTENSIONS -#define CONFIG_EDITION ConfigStrings::EDITION #define CONFIG_ENDHEADER ConfigStrings::ENDHEADER #define CONFIG_EXAMPLEDIRS ConfigStrings::EXAMPLEDIRS #define CONFIG_EXAMPLES ConfigStrings::EXAMPLES |