diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-05 18:48:33 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-05 18:48:33 (GMT) |
| commit | 4409d1b454f02fa1e5e07560a1db6012074172eb (patch) | |
| tree | 4d4ba7b306bb2a2d8b6d143cb29e3a938ae1e39f /tools/qdoc3/qmlcodeparser.cpp | |
| parent | 2c13a817501a7acb83cbf56d121ec572c1b4b1e9 (diff) | |
| parent | 7fd997903620bca50a4303776ef7aca8f0ea1f01 (diff) | |
| download | Qt-4409d1b454f02fa1e5e07560a1db6012074172eb.zip Qt-4409d1b454f02fa1e5e07560a1db6012074172eb.tar.gz Qt-4409d1b454f02fa1e5e07560a1db6012074172eb.tar.bz2 | |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team:
Fixed the declarative headers and includes within qdoc.
Removed invalid public slots section.
Minor feature fix led to refactoring for i18n's sake.
Fixed string-int concatenation issue.
Doc: Minor fix to title.
Doc: Fixed markup.
Doc: Added a missing command.
Doc: Removed duplicate documentation.
Removed some links and prettified others.
Doc: Squashed commit of Roland Wolf's threading tutorial.
Diffstat (limited to 'tools/qdoc3/qmlcodeparser.cpp')
| -rw-r--r-- | tools/qdoc3/qmlcodeparser.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/qdoc3/qmlcodeparser.cpp b/tools/qdoc3/qmlcodeparser.cpp index 93a3ff9..45ca96f 100644 --- a/tools/qdoc3/qmlcodeparser.cpp +++ b/tools/qdoc3/qmlcodeparser.cpp @@ -43,9 +43,9 @@ qmlcodeparser.cpp */ -#include "private/qdeclarativejsast_p.h" -#include "private/qdeclarativejsastvisitor_p.h" -#include "private/qdeclarativejsnodepool_p.h" +#include "declarativeparser/qdeclarativejsast_p.h" +#include "declarativeparser/qdeclarativejsastvisitor_p.h" +#include "declarativeparser/qdeclarativejsnodepool_p.h" #include "qmlcodeparser.h" #include "node.h" |