diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-11-11 07:46:20 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-11-11 07:46:20 (GMT) |
| commit | 8e5166aba8c8d79e47d4c4fccd5acf52f9cffec6 (patch) | |
| tree | f9b91b73e52ec389107cc8791ac76e87f962944b /tools/qdoc3/cppcodemarker.cpp | |
| parent | 6ac7ce79b6041a7c35d08cb28f775dead9701c4b (diff) | |
| parent | 0faef2ba318b7df095d5c20fdddd0933ae4912c3 (diff) | |
| download | Qt-8e5166aba8c8d79e47d4c4fccd5acf52f9cffec6.zip Qt-8e5166aba8c8d79e47d4c4fccd5acf52f9cffec6.tar.gz Qt-8e5166aba8c8d79e47d4c4fccd5acf52f9cffec6.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/util/util.pri
Diffstat (limited to 'tools/qdoc3/cppcodemarker.cpp')
| -rw-r--r-- | tools/qdoc3/cppcodemarker.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qdoc3/cppcodemarker.cpp b/tools/qdoc3/cppcodemarker.cpp index a8f6a02..f3c8fa5 100644 --- a/tools/qdoc3/cppcodemarker.cpp +++ b/tools/qdoc3/cppcodemarker.cpp @@ -1127,7 +1127,7 @@ QList<Section> CppCodeMarker::qmlSections(const QmlClassNode* qmlClassNode, "signal", "signals"); FastSection qmlattachedsignals(qmlClassNode, - "QML Attached Signals", + "Attached Signals", "signal", "signals"); FastSection qmlmethods(qmlClassNode, @@ -1135,7 +1135,7 @@ QList<Section> CppCodeMarker::qmlSections(const QmlClassNode* qmlClassNode, "method", "methods"); FastSection qmlattachedmethods(qmlClassNode, - "QML Attached Methods", + "Attached Methods", "method", "methods"); |