diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
---|---|---|
committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
commit | 440f452aa3a5609e5f6006a03ac36d41462d5908 (patch) | |
tree | 598d682291945055e4f6feb08a228212648482c1 /src/tools/qdoc/qdoc.pro | |
parent | cd1e62ffc121cc68c5a133a8095d431f04d966ce (diff) | |
parent | d4959fa6376255ab4adf8adaeb2ee47ae6b679d2 (diff) |
Merge master into api_changes
Conflicts:
src/corelib/kernel/qmetatype.cpp
src/gui/kernel/qplatformsurface_qpa.cpp
tests/auto/corelib/tools/qtimeline/qtimeline.pro
Change-Id: Iff3fff34eeeb06f02369767ddfce44cfde505178
Diffstat (limited to 'src/tools/qdoc/qdoc.pro')
-rw-r--r-- | src/tools/qdoc/qdoc.pro | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/tools/qdoc/qdoc.pro b/src/tools/qdoc/qdoc.pro index fca5a3daf4..03de9f91df 100644 --- a/src/tools/qdoc/qdoc.pro +++ b/src/tools/qdoc/qdoc.pro @@ -9,9 +9,14 @@ DEFINES -= QT_NO_CAST_FROM_ASCII DEFINES += QT_NO_TRANSLATION INCLUDEPATH += $$QT_SOURCE_TREE/src/tools/qdoc \ - $$QT_SOURCE_TREE/src/tools/qdoc/qmlparser + $$QT_SOURCE_TREE/src/tools/qdoc/qmlparser \ + $$QT_BUILD_TREE/include/QtXml \ + $$QT_BUILD_TREE/include/QtXml/$$QT.xml.VERSION \ + $$QT_BUILD_TREE/include/QtXml/$$QT.xml.VERSION/QtXml + DEPENDPATH += $$QT_SOURCE_TREE/src/tools/qdoc \ - $$QT_SOURCE_TREE/src/tools/qdoc/qmlparser + $$QT_SOURCE_TREE/src/tools/qdoc/qmlparser \ + $$QT_SOURCE_TREE/src/xml # Increase the stack size on MSVC to 4M to avoid a stack overflow win32-msvc*:{ @@ -68,7 +73,9 @@ SOURCES += atom.cpp \ text.cpp \ tokenizer.cpp \ tree.cpp \ - yyindent.cpp + yyindent.cpp \ + ../../xml/dom/qdom.cpp \ + ../../xml/sax/qxml.cpp ### QML/JS Parser ### |