diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-15 06:33:36 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-15 06:33:36 (GMT) |
| commit | 9f8b09ad70845fa5e9bc232d9e0de1274e732895 (patch) | |
| tree | df793174a7c7fa57ca732a187693a97c31e8a62b /tools/qdoc3/config.h | |
| parent | 792835df3051f73b11d5a27313a9b4439af49911 (diff) | |
| parent | 6536b6f16ff26579f191543e5d468a6382211a29 (diff) | |
| download | Qt-9f8b09ad70845fa5e9bc232d9e0de1274e732895.zip Qt-9f8b09ad70845fa5e9bc232d9e0de1274e732895.tar.gz Qt-9f8b09ad70845fa5e9bc232d9e0de1274e732895.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: (86 commits)
Add unit tests for QMimeData.
fix qconfig.h reference for shadow builds
Drag and drop cursor doesnot change on invalid drop areas (Cocoa)
Crash while runnig tst_QMdiSubWindow::emittingOfSignals test on Cocoa
fix qconfig.h aliased header creation
fix warning directive on gnuc
qdoc: Removed navigation arrow that was causing display problems.
Silence warning when building with MSVC 2005
Fix an Assert in QTextTable
Revert "Fix an Assert in QTextTable"
Attempt to fix build failure with msvc200{5,8} on Windows XP.
fix macx not having UNICODE in DEFINES any more
doc: Fixed several qdoc warnings.
Fix an Assert in QTextTable
doc: Fixed several qdoc warnings.
QSslSocket: Improve error handling
qdoc: Fixed several <div> elements that had the "/>" ending.
QSslSocket: fix documentation for QSslSocket::setPeerVerifyMode()
qdoc: Fixed breadcrumbs for QML examples.
remove redundand translations project files
...
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 c29becc..af58a3f 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_CREATOR "creator" #define CONFIG_OUTPUTDIR "outputdir" #define CONFIG_OUTPUTENCODING "outputencoding" #define CONFIG_OUTPUTLANGUAGE "outputlanguage" |