diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:21 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:35 +0200 |
| commit | d0eb444a49f6064ecb896f62276e060cd8a4b1e8 (patch) | |
| tree | 34d8dd637baf665225ada73e76604531cd2c75e5 /src/tools/qdoc/node.h | |
| parent | da0cb32b8ee7cc4a991a59420a411898e63a660e (diff) | |
| parent | 894f86709080fe8d20875b402adce679963c49c2 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ib8cfeee7d9ca15e8ad520e428b72c200827a8628
Diffstat (limited to 'src/tools/qdoc/node.h')
| -rw-r--r-- | src/tools/qdoc/node.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/qdoc/node.h b/src/tools/qdoc/node.h index a530a2cf231..9e736aeba63 100644 --- a/src/tools/qdoc/node.h +++ b/src/tools/qdoc/node.h @@ -274,7 +274,7 @@ public: virtual ClassNode* classNode() { return 0; } virtual void setClassNode(ClassNode* ) { } virtual void clearCurrentChild() { } - virtual const Node* applyModuleIdentifier(const Node* ) const { return 0; } + virtual const Node* applyModuleName(const Node* ) const { return 0; } virtual QString idNumber() { return "0"; } QmlClassNode* qmlClassNode(); ClassNode* declarativeCppNode(); @@ -556,7 +556,7 @@ public: virtual void clearCurrentChild() { current = 0; } virtual bool isQmlNode() const; virtual bool isCollisionNode() const { return true; } - virtual const Node* applyModuleIdentifier(const Node* origin) const; + virtual const Node* applyModuleName(const Node* origin) const; InnerNode* findAny(Node::Type t, Node::SubType st); void addCollision(InnerNode* child); const QMap<QString,QString>& linkTargets() const { return targets; } |