From e268cf6a383a1860a4ed6b8f579eb6d9e1b34e12 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Wed, 31 Oct 2012 11:32:09 +0100
Subject: [PATCH] add (parts of) QtXml to the bootstrap lib

we bootstrap it anyway (as qdoc already needed it). now lrelease will
also need it.

Change-Id: I5117634448368e18d6cf5540d678e039a66c7260
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 src/tools/bootstrap/bootstrap.pro | 13 ++++++++++---
 src/tools/qdoc/qdoc.pro           | 12 +++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index 8c847b5f73..10bbfb48e5 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -29,7 +29,10 @@ MODULE_PRIVATE_INCLUDES = \
     \$\$QT_MODULE_INCLUDE_BASE \
     \$\$QT_MODULE_INCLUDE_BASE/QtCore \
     \$\$QT_MODULE_INCLUDE_BASE/QtCore/$$QT_VERSION \
-    \$\$QT_MODULE_INCLUDE_BASE/QtCore/$$QT_VERSION/QtCore
+    \$\$QT_MODULE_INCLUDE_BASE/QtCore/$$QT_VERSION/QtCore \
+    \$\$QT_MODULE_INCLUDE_BASE/QtXml \
+    \$\$QT_MODULE_INCLUDE_BASE/QtXml/$$QT_VERSION \
+    \$\$QT_MODULE_INCLUDE_BASE/QtXml/$$QT_VERSION/QtXml
 
 qtProcessModuleFlags(CONFIG, MODULE_CONFIG)
 
@@ -43,7 +46,9 @@ DEPENDPATH += $$INCLUDEPATH \
               ../../corelib/tools \
               ../../corelib/io \
               ../../corelib/codecs \
-              ../../corelib/json
+              ../../corelib/json \
+              ../../xml/dom \
+              ../../xml/sax
 
 SOURCES += \
            ../../corelib/codecs/qlatincodec.cpp \
@@ -102,7 +107,9 @@ SOURCES += \
            ../../corelib/json/qjsonarray.cpp \
            ../../corelib/json/qjsonvalue.cpp \
            ../../corelib/json/qjsonparser.cpp \
-           ../../corelib/json/qjsonwriter.cpp
+           ../../corelib/json/qjsonwriter.cpp \
+           ../../xml/dom/qdom.cpp \
+           ../../xml/sax/qxml.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 0c00ec6310..a30879dd2b 100644
--- a/src/tools/qdoc/qdoc.pro
+++ b/src/tools/qdoc/qdoc.pro
@@ -7,14 +7,10 @@ DESTDIR = ../../../bin
 DEFINES += QDOC2_COMPAT
 
 INCLUDEPATH += $$QT_SOURCE_TREE/src/tools/qdoc \
-               $$QT_SOURCE_TREE/src/tools/qdoc/qmlparser \
-               $$QT_BUILD_TREE/include/QtXml \
-               $$QT_BUILD_TREE/include/QtXml/$$QT_VERSION \
-               $$QT_BUILD_TREE/include/QtXml/$$QT_VERSION/QtXml
+               $$QT_SOURCE_TREE/src/tools/qdoc/qmlparser
 
 DEPENDPATH += $$QT_SOURCE_TREE/src/tools/qdoc \
-              $$QT_SOURCE_TREE/src/tools/qdoc/qmlparser \
-              $$QT_SOURCE_TREE/src/xml
+              $$QT_SOURCE_TREE/src/tools/qdoc/qmlparser
 
 # Increase the stack size on MSVC to 4M to avoid a stack overflow
 win32-msvc*:{
@@ -76,9 +72,7 @@ SOURCES += atom.cpp \
            tokenizer.cpp \
            tree.cpp \
            yyindent.cpp \
-           ../../corelib/tools/qcryptographichash.cpp \
-           ../../xml/dom/qdom.cpp \
-           ../../xml/sax/qxml.cpp
+           ../../corelib/tools/qcryptographichash.cpp
 
 ### QML/JS Parser ###