diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-11-09 07:43:42 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-11-09 07:43:42 (GMT) |
| commit | d2bcb0dfbc79c382dad87d3d2154ca127ae8fc16 (patch) | |
| tree | c0848d1fc8fd2215fe32d75dcbe86354b0344282 /tools/qdoc3 | |
| parent | dbbe24f0f04e5a0aaf9223b73bee873e208a1fa7 (diff) | |
| parent | b8b7f98b01d9ad03fecac7a0f593ac5734d7af1d (diff) | |
| download | Qt-d2bcb0dfbc79c382dad87d3d2154ca127ae8fc16.zip Qt-d2bcb0dfbc79c382dad87d3d2154ca127ae8fc16.tar.gz Qt-d2bcb0dfbc79c382dad87d3d2154ca127ae8fc16.tar.bz2 | |
Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui
Conflicts:
configure.exe
src/corelib/animation/qabstractanimation.cpp
src/gui/graphicsview/qgraphicsview.cpp
src/s60installs/s60installs.pro
tools/configure/configureapp.cpp
tools/qdoc3/node.h
Diffstat (limited to 'tools/qdoc3')
| -rw-r--r-- | tools/qdoc3/node.h | 30 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt-html-templates.qdocconf | 4 |
2 files changed, 32 insertions, 2 deletions
diff --git a/tools/qdoc3/node.h b/tools/qdoc3/node.h index 3f5be6c..4e12846 100644 --- a/tools/qdoc3/node.h +++ b/tools/qdoc3/node.h @@ -425,6 +425,36 @@ class QmlPropertyNode : public LeafNode Trool wri; bool att; }; + +class QmlSignalNode : public LeafNode +{ + public: + QmlSignalNode(QmlClassNode* parent, + const QString& name, + bool attached); + virtual ~QmlSignalNode() { } + + const QString& element() const { return parent()->name(); } + bool isAttached() const { return att; } + + private: + bool att; +}; + +class QmlMethodNode : public LeafNode +{ + public: + QmlMethodNode(QmlClassNode* parent, + const QString& name, + bool attached); + virtual ~QmlMethodNode() { } + + const QString& element() const { return parent()->name(); } + bool isAttached() const { return att; } + + private: + bool att; +}; #endif class EnumItem diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index 7ceacb2..8c039eb 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -35,7 +35,7 @@ HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \ \ "<script type=\"text/javascript\" src=\"http://www.google.com/jsapi\"></script>" \ "<script type=\"text/javascript\">google.load(\"elements\", \"1\", {packages: \"transliteration\"});</script>" \ - "<script type=\"text/javascript\" src=\"http://www.google.com/coop/cse/t13n?form=cse-search-box&t13n_langs=en\"></script>" \ + "<script type=\"text/javascript\" src=\"http://www.google.com/coop/cse/t13n?form=cse-search-box&t13n_langs=en\"></script>" \ \ - "<script type=\"text/javascript\" src=\"http://www.google.com/coop/cse/brand?form=cse-search-box&lang=en\"></script>"\ + "<script type=\"text/javascript\" src=\"http://www.google.com/coop/cse/brand?form=cse-search-box&lang=en\"></script>"\ "</tr></table></div></address>" |