diff options
author | Hugo Parente Lima <hugo.pl@gmail.com> | 2011-03-01 15:41:49 -0300 |
---|---|---|
committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2011-03-01 15:55:19 -0300 |
commit | d401ac2ad96082211c48b584a11c51c0c81a837c (patch) | |
tree | e1dc0bbfbfe35a8f253b7b7d0eca9a2b5ec95193 /generators/qtdoc/qtdocgenerator.h | |
parent | 14ae00ad2aab93770bd7b023fbb247e606019757 (diff) |
documentation-code-snippets-dir option now accepts multiple directories.
Diffstat (limited to 'generators/qtdoc/qtdocgenerator.h')
-rw-r--r-- | generators/qtdoc/qtdocgenerator.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/generators/qtdoc/qtdocgenerator.h b/generators/qtdoc/qtdocgenerator.h index dd2091d7f..f88055771 100644 --- a/generators/qtdoc/qtdocgenerator.h +++ b/generators/qtdoc/qtdocgenerator.h @@ -141,7 +141,8 @@ private: QString m_lastTagName; QString m_opened_anchor; - QString readFromLocation(QString& location, QString& identifier); + QString readFromLocations(const QStringList& locations, const QString& path, const QString& identifier); + QString readFromLocation(const QString& location, const QString& identifier, bool* ok = 0); void pushOutputBuffer(); QString popOutputBuffer(); void writeTable(Table& table); @@ -177,9 +178,9 @@ public: QMap<QString, QString> options() const; - QString codeSnippetDir() const + QStringList codeSnippetDirs() const { - return m_codeSnippetDir; + return m_codeSnippetDirs; } protected: @@ -212,7 +213,7 @@ private: QString m_docDataDir; QString m_libSourceDir; - QString m_codeSnippetDir; + QStringList m_codeSnippetDirs; QString m_extraSectionDir; QStringList m_functionList; QMap<QString, QStringList> m_packages; |