diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-06-21 13:49:11 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-06-21 13:49:11 (GMT) |
| commit | 3fb36b36de90068db241cc21184a8ac3b899ad2d (patch) | |
| tree | 22490e313f1415681ddfb35f1b0ea0dca8f94ac6 /tools/qdoc3/node.h | |
| parent | d11e3d6e327677e828918de3173732116976fbe4 (diff) | |
| parent | f34f4ea2d35b92631e98a772e02a1b77ce26681e (diff) | |
| download | Qt-3fb36b36de90068db241cc21184a8ac3b899ad2d.zip Qt-3fb36b36de90068db241cc21184a8ac3b899ad2d.tar.gz Qt-3fb36b36de90068db241cc21184a8ac3b899ad2d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tools/qdoc3/node.h')
| -rw-r--r-- | tools/qdoc3/node.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/qdoc3/node.h b/tools/qdoc3/node.h index 44cdac2..4d1e757 100644 --- a/tools/qdoc3/node.h +++ b/tools/qdoc3/node.h @@ -191,7 +191,8 @@ class Node void clearRelated() { rel = 0; } virtual QString fileBase() const; - QUuid guid() const { return uuid; } + //QUuid guid() const { return uuid; } + QUuid guid(); QString ditaXmlHref(); protected: |