AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bootstrap: remove QtXml dependency

Browse Source 
Only qdoc is now using QtXml classes, so just add them to qdoc.pro
and drop them from the bootstrap library.

Change-Id: I821839396141d1d7a2ada565a513aa46c54c9620
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Giuseppe D'Angelo 2012-02-29 00:48:43 +00:00 committed by Qt by Nokia
parent c8ba6a49da
commit f57190fb82
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tools/bootstrap/bootstrap.pri
View File

@ -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

12
src/tools/bootstrap/bootstrap.pro
View File

@ -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 \

13
src/tools/qdoc/qdoc.pro
View File

@ -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 ###