diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-11 18:03:49 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-11 18:05:16 +0100 |
| commit | fe2c46d86e4287580191fc71357ec776cf1f5dd8 (patch) | |
| tree | 2d580b6a291206d0de54404e03a06b5c58b07b22 /src/qdoc/config.h | |
| parent | fff948341a61ce592013303ec40e64a1bf27e678 (diff) | |
| parent | 58f0987e16ac4580d9e4a6b604dd7603510b0385 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: Ieef1b05234ee67bef28f2dc9abaa65f10840d21b
Diffstat (limited to 'src/qdoc/config.h')
| -rw-r--r-- | src/qdoc/config.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qdoc/config.h b/src/qdoc/config.h index 71dbb658a..cbff9771b 100644 --- a/src/qdoc/config.h +++ b/src/qdoc/config.h @@ -185,6 +185,7 @@ struct ConfigStrings static QString HEADERSCRIPTS; static QString HEADERSTYLES; static QString HOMEPAGE; + static QString HOMETITLE; static QString IGNOREDIRECTIVES; static QString IGNORETOKENS; static QString IMAGEDIRS; @@ -192,6 +193,7 @@ struct ConfigStrings static QString INCLUDEPATHS; static QString INDEXES; static QString LANDINGPAGE; + static QString LANDINGTITLE; static QString LANGUAGE; static QString MACRO; static QString MANIFESTMETA; @@ -269,6 +271,7 @@ struct ConfigStrings #define CONFIG_HEADERSCRIPTS ConfigStrings::HEADERSCRIPTS #define CONFIG_HEADERSTYLES ConfigStrings::HEADERSTYLES #define CONFIG_HOMEPAGE ConfigStrings::HOMEPAGE +#define CONFIG_HOMETITLE ConfigStrings::HOMETITLE #define CONFIG_IGNOREDIRECTIVES ConfigStrings::IGNOREDIRECTIVES #define CONFIG_IGNORETOKENS ConfigStrings::IGNORETOKENS #define CONFIG_IMAGEDIRS ConfigStrings::IMAGEDIRS @@ -276,6 +279,7 @@ struct ConfigStrings #define CONFIG_INCLUDEPATHS ConfigStrings::INCLUDEPATHS #define CONFIG_INDEXES ConfigStrings::INDEXES #define CONFIG_LANDINGPAGE ConfigStrings::LANDINGPAGE +#define CONFIG_LANDINGTITLE ConfigStrings::LANDINGTITLE #define CONFIG_LANGUAGE ConfigStrings::LANGUAGE #define CONFIG_MACRO ConfigStrings::MACRO #define CONFIG_MANIFESTMETA ConfigStrings::MANIFESTMETA |