diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-03 09:06:47 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-03 09:06:47 (GMT) |
| commit | 660ebda77f6cbc4a41f45f78e18dbc892cd1c551 (patch) | |
| tree | 36ecf9860281d337bfda350c597951623838ca9f /tools/qdoc3/codemarker.h | |
| parent | 43482fcfc106864f104f463002575c389d40b12f (diff) | |
| parent | 78df9e39a43b21f7f0fedca11f906a2ae9df99c1 (diff) | |
| download | Qt-660ebda77f6cbc4a41f45f78e18dbc892cd1c551.zip Qt-660ebda77f6cbc4a41f45f78e18dbc892cd1c551.tar.gz Qt-660ebda77f6cbc4a41f45f78e18dbc892cd1c551.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/gui/graphicsview/qgraphicslayout.cpp
src/gui/graphicsview/qgraphicslayout_p.cpp
Diffstat (limited to 'tools/qdoc3/codemarker.h')
| -rw-r--r-- | tools/qdoc3/codemarker.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/qdoc3/codemarker.h b/tools/qdoc3/codemarker.h index 21bc31f..00660e7 100644 --- a/tools/qdoc3/codemarker.h +++ b/tools/qdoc3/codemarker.h @@ -165,10 +165,11 @@ class CodeMarker static const Node *nodeForString(const QString& string); static QString stringForNode(const Node *node); + QString typified(const QString &string); + protected: virtual QString sortName(const Node *node); QString protect(const QString &string); - QString typified(const QString &string); QString taggedNode(const Node* node); #ifdef QDOC_QML QString taggedQmlNode(const Node* node); |