diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-27 22:33:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-27 22:33:26 (GMT) |
| commit | b65e9811968ec2e122b0e7f6b9a58dce50e3c01c (patch) | |
| tree | 5c394813841d5172e3430f20b0500ffc10fc594e /tools/qdoc3/config.h | |
| parent | 7795c14a574fcee67c840ce996602d61e66683f5 (diff) | |
| parent | 7f9205aa572c60085c9e9f38749bb48e707fea95 (diff) | |
| download | Qt-b65e9811968ec2e122b0e7f6b9a58dce50e3c01c.zip Qt-b65e9811968ec2e122b0e7f6b9a58dce50e3c01c.tar.gz Qt-b65e9811968ec2e122b0e7f6b9a58dce50e3c01c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Adding missing image
Fix QT_NO_DATESTRING
Check the gesturemanager pointer before accessing it.
Added files that had been renamed.
Modified file/directory names and text to remove disallowed terminology.
Cherry pick fix for MOBILITY-1077 from Qt Mobility.
Fix typo in docs.
Cherry pick fix for MOBILITY-1145 from Qt Mobility.
Cherry pick fix for MOBILITY-1144 from Qt Mobility.
Fixed the following sub-tasks for QTBUG-12192
Diffstat (limited to 'tools/qdoc3/config.h')
| -rw-r--r-- | tools/qdoc3/config.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/qdoc3/config.h b/tools/qdoc3/config.h index af58a3f..b087b1c 100644 --- a/tools/qdoc3/config.h +++ b/tools/qdoc3/config.h @@ -143,6 +143,7 @@ class Config #define CONFIG_NATURALLANGUAGE "naturallanguage" #define CONFIG_OBSOLETELINKS "obsoletelinks" #define CONFIG_ONLINE "online" +#define CONFIG_OFFLINE "offline" #define CONFIG_CREATOR "creator" #define CONFIG_OUTPUTDIR "outputdir" #define CONFIG_OUTPUTENCODING "outputencoding" |