diff options
| author | con <qtc-committer@nokia.com> | 2010-07-13 11:34:44 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-07-13 11:34:44 +0200 |
| commit | c3594213fdc4d47312d839ffea60600c6f654ad8 (patch) | |
| tree | 9de9e498bdc43c3d1a915f20e3412884b0ad7778 /doc/qtcreator.qdocconf | |
| parent | d24d01f49c92cc45f7473ded912a5fef2e068e99 (diff) | |
| parent | b2cb2f6e3369a113153735994b73b1bcbfde8576 (diff) | |
| download | qt-creator-c3594213fdc4d47312d839ffea60600c6f654ad8.tar.gz | |
Merge remote branch 'origin/2.0'
Conflicts:
doc/qtcreator.qdoc
Diffstat (limited to 'doc/qtcreator.qdocconf')
| -rw-r--r-- | doc/qtcreator.qdocconf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf index 4396355716..360be06b6e 100644 --- a/doc/qtcreator.qdocconf +++ b/doc/qtcreator.qdocconf @@ -219,3 +219,5 @@ Cpp.ignoredirectives = Q_DECLARE_HANDLE \ K_DECLARE_PRIVATE \ PHONON_OBJECT \ PHONON_HEIR + +creator = true |