diff options
| author | con <qtc-committer@nokia.com> | 2011-01-12 10:20:46 +0100 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2011-01-12 10:20:46 +0100 |
| commit | f46a87a6f5e2a5069e4d80abf48cd48dd568a9c3 (patch) | |
| tree | f6a057050af8df431f6baf720d46f527bdadd1db /doc/qtcreator.qdocconf | |
| parent | a444cdc7aa7bcbe13485748536892822adcc3c8c (diff) | |
| parent | 9a7e4865a5c9cf1fce9a10436e25ebb80ae0d069 (diff) | |
| download | qt-creator-f46a87a6f5e2a5069e4d80abf48cd48dd568a9c3.tar.gz | |
Merge remote branch 'origin/2.1'
Conflicts:
src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp
Diffstat (limited to 'doc/qtcreator.qdocconf')
| -rw-r--r-- | doc/qtcreator.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf index d78705e23e..1959c623e6 100644 --- a/doc/qtcreator.qdocconf +++ b/doc/qtcreator.qdocconf @@ -89,7 +89,7 @@ macro.QL = "\\e{Qt Linguist}" macro.QC = "\\e{Qt Creator}" macro.QMLD = "\\e{Qt Quick Designer}" macro.QQV = "\\e{Qt QML Viewer}" -macro.QSDK = "\\e{Nokia Qt SDK}" +macro.QSDK = "\\e{Qt SDK}" macro.param = "\\e" macro.raisedaster.HTML = "<sup>*</sup>" macro.reg.HTML = "<sup>®</sup>" |