summaryrefslogtreecommitdiffstats
path: root/src/tools/bootstrap
diff options
context:
space:
mode:
authorGiuseppe D'Angelo <dangelog@gmail.com>2012-02-29 00:48:43 +0000
committerQt by Nokia <qt-info@nokia.com>2012-03-14 18:24:32 +0100
commitf57190fb827e7810e67d05a7049e69d4c8297594 (patch)
treeec62c985a4af3c3071539e5ae1556a918a8d7e86 /src/tools/bootstrap
parentc8ba6a49da174982c881fef1b54b54bbe03405b7 (diff)
bootstrap: remove QtXml dependency
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>
Diffstat (limited to 'src/tools/bootstrap')
-rw-r--r--src/tools/bootstrap/bootstrap.pri9
-rw-r--r--src/tools/bootstrap/bootstrap.pro12
2 files changed, 5 insertions, 16 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 \