diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-20 04:31:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-20 04:31:09 (GMT) |
| commit | 99f6250a4ac031b70757442715b226bc339ab699 (patch) | |
| tree | ae7fd462b5255a0ed8cef079716f64749bc02e9c /tools/qdoc3/test/macros.qdocconf | |
| parent | 178a4e12da0601ecc662851e5bf7f124932e1a12 (diff) | |
| parent | e75088323ae15604139ddfd66b85cc3b8d43abeb (diff) | |
| download | Qt-99f6250a4ac031b70757442715b226bc339ab699.zip Qt-99f6250a4ac031b70757442715b226bc339ab699.tar.gz Qt-99f6250a4ac031b70757442715b226bc339ab699.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (53 commits)
Be consistent in conversion from string (eg. color, int rounding).
Simplify code to make next change clearer.
Stop warnings.
Improve error messages when tests fail.
Stop highlight animators for highlightFollowsCurrentItem: false
Ensure valuetype enums can be assigned from JS
Improve testcase
Rename Component::errorsString() -> errorString() (and also for
Fixes for docs, example code
Make test more stable
Autotest (XFAIL) for QTBUG-10822
Add return value for resolveTypeInNamespace
Fix test
Fix test. Missed files.
Missing break
Create overview page for examples for Extending QML in C++
Search for QML import libraries also in application directory
Doc improvements
Disable mouse-based selection in TextInput/TextEdit
Rename qml executable to qmlviewer
...
Diffstat (limited to 'tools/qdoc3/test/macros.qdocconf')
| -rw-r--r-- | tools/qdoc3/test/macros.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qdoc3/test/macros.qdocconf b/tools/qdoc3/test/macros.qdocconf index e7a1dbc..510a8b3 100644 --- a/tools/qdoc3/test/macros.qdocconf +++ b/tools/qdoc3/test/macros.qdocconf @@ -18,7 +18,7 @@ macro.ouml.HTML = "ö" macro.QA = "\\e{Qt Assistant}" macro.QD = "\\e{Qt Designer}" macro.QL = "\\e{Qt Linguist}" -macro.QQL = "\\e{Qt QML Launcher}" +macro.QQV = "\\e{Qt QML Viewer}" macro.param = "\\e" macro.raisedaster.HTML = "<sup>*</sup>" macro.rarrow.HTML = "→" |