remove some bogus include locations

nothing to be found in <sourcedir>/include.
neither in <builddir>/src/corelib/xml.

Change-Id: I381391a64542dc2ac7b421b6646c60a1b7a14639
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>

diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
index 16af493..d983593 100644 (file)
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
@@ -73,7 +73,7 @@ CPPFLAGS = -g -I. -Igenerators -Igenerators/unix -Igenerators/win32 \
            -Igenerators/mac -Igenerators/integrity \
           -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
           -I$(BUILD_PATH)/include/QtCore/$(QT_VERSION) -I$(BUILD_PATH)/include/QtCore/$(QT_VERSION)/QtCore \
-          -I$(BUILD_PATH)/src/corelib/global -I$(BUILD_PATH)/src/corelib/xml \
+          -I$(BUILD_PATH)/src/corelib/global \
           -I$(SOURCE_PATH)/tools/shared \
           -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED \
           -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \

diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32
index 767237f..f640216 100644 (file)
--- a/qmake/Makefile.win32
+++ b/qmake/Makefile.win32
@@ -33,9 +33,7 @@ CFLAGS_BARE = -c -Fo./ \
               $(CFLAGS_EXTRA) \
               -I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -Igenerators\integrity \
               -I$(BUILD_PATH)\include -I$(BUILD_PATH)\include\QtCore -I$(BUILD_PATH)\include\QtCore\$(QT_VERSION) -I$(BUILD_PATH)\include\QtCore\$(QT_VERSION)\QtCore \
-              -I$(SOURCE_PATH)\include -I$(SOURCE_PATH)\include\QtCore -I$(SOURCE_PATH)\include\QtCore\$(QT_VERSION) -I$(SOURCE_PATH)\include\QtCore\$(QT_VERSION)\QtCore \
               -I$(BUILD_PATH)\src\corelib\global \
-              -I$(BUILD_PATH)\src\corelib\xml \
               -I$(SOURCE_PATH)\mkspecs\$(QMAKESPEC)  \
               -I$(SOURCE_PATH)\tools\shared \
               -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL \

diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++
index 86ddcf4..57e6c1a 100644 (file)
--- a/qmake/Makefile.win32-g++
+++ b/qmake/Makefile.win32-g++
@@ -47,9 +47,7 @@ CFLAGS            =   -c -o$@ -O \
                -Igenerators/win32 -Igenerators/mac \
                -Igenerators/integrity \
                -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore -I$(BUILD_PATH)/include/QtCore/$(QT_VERSION) -I$(BUILD_PATH)/include/QtCore/$(QT_VERSION)/QtCore \
-               -I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore -I$(SOURCE_PATH)/include/QtCore/$(QT_VERSION) -I$(SOURCE_PATH)/include/QtCore/$(QT_VERSION)/QtCore \
                -I$(BUILD_PATH)/src/corelib/global \
-               -I$(BUILD_PATH)/src/corelib/xml \
                -I$(SOURCE_PATH)/mkspecs/win32-g++  \
                -I$(SOURCE_PATH)/tools/shared \
                -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT \