diff options
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pri | 9 | ||||
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 12 | ||||
| -rw-r--r-- | src/tools/qdoc/qdoc.pro | 13 |
3 files changed, 15 insertions, 19 deletions
diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri index e34cc5c033..228fcaca0d 100644 --- a/src/tools/bootstrap/bootstrap.pri +++ b/src/tools/bootstrap/bootstrap.pri @@ -29,18 +29,13 @@ win32:DEFINES += QT_NODLL INCLUDEPATH += $$QT_BUILD_TREE/include \ $$QT_BUILD_TREE/include/QtCore \ $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION \ - $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION/QtCore \ - $$QT_BUILD_TREE/include/QtXml \ - $$QT_BUILD_TREE/include/QtXml/$$QT.xml.VERSION \ - $$QT_BUILD_TREE/include/QtXml/$$QT.xml.VERSION/QtXml \ - $$QT_SOURCE_TREE/src/xml + $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION/QtCore DEPENDPATH += $$INCLUDEPATH \ $$QT_SOURCE_TREE/src/corelib/global \ $$QT_SOURCE_TREE/src/corelib/kernel \ $$QT_SOURCE_TREE/src/corelib/tools \ $$QT_SOURCE_TREE/src/corelib/io \ - $$QT_SOURCE_TREE/src/corelib/codecs \ - $$QT_SOURCE_TREE/src/xml + $$QT_SOURCE_TREE/src/corelib/codecs hpux-acc*|hpuxi-acc* { LIBS += $$QT_BUILD_TREE/src/tools/bootstrap/libbootstrap.a diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 1d641d2301..5b70a5af64 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -32,10 +32,7 @@ win32:DEFINES += QT_NODLL INCLUDEPATH += $$QT_BUILD_TREE/include \ $$QT_BUILD_TREE/include/QtCore \ $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION \ - $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION/QtCore \ - $$QT_BUILD_TREE/include/QtXml \ - $$QT_BUILD_TREE/include/QtXml/$$QT.xml.VERSION \ - $$QT_BUILD_TREE/include/QtXml/$$QT.xml.VERSION/QtXml \ + $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION/QtCore DEPENDPATH += $$INCLUDEPATH \ ../../corelib/global \ @@ -43,8 +40,7 @@ DEPENDPATH += $$INCLUDEPATH \ ../../corelib/tools \ ../../corelib/io \ ../../corelib/codecs \ - ../../corelib/json \ - ../../xml + ../../corelib/json SOURCES += \ ../../corelib/codecs/qlatincodec.cpp \ @@ -96,9 +92,7 @@ SOURCES += \ ../../corelib/json/qjsonarray.cpp \ ../../corelib/json/qjsonvalue.cpp \ ../../corelib/json/qjsonparser.cpp \ - ../../corelib/json/qjsonwriter.cpp \ - ../../xml/dom/qdom.cpp \ - ../../xml/sax/qxml.cpp + ../../corelib/json/qjsonwriter.cpp unix:SOURCES += ../../corelib/io/qfilesystemengine_unix.cpp \ ../../corelib/io/qfilesystemiterator_unix.cpp \ 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 ### |