make the non-bootstrapped build work again

Change-Id: I48d33bea7fd3081461e6edcf7077bfb749e2d2b7
Reviewed-on: http://codereview.qt.nokia.com/1433
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>

diff --git a/qmake/qmake.pri b/qmake/qmake.pri
index d6c5f09..79794e7 100644 (file)
--- a/qmake/qmake.pri
+++ b/qmake/qmake.pri
@@ -68,6 +68,7 @@ bootstrap { #Qt code
         qlist.cpp \
         qlinkedlist.cpp \
         qlocale.cpp \
+        qlocale_tools.cpp \
         qmalloc.cpp \
         qmap.cpp \
         qmetatype.cpp \
@@ -111,6 +112,7 @@ bootstrap { #Qt code
         qlist.h \
         qlinkedlist.h \
         qlocale.h \
+        qlocale_tools_p.h \
         qmalloc.h \
         qmap.h \
         qmetatype.h \

diff --git a/qmake/qmake.pro b/qmake/qmake.pro
index ac52bd8..6c7d0d2 100644 (file)
--- a/qmake/qmake.pro
+++ b/qmake/qmake.pro
@@ -25,6 +25,7 @@ INCLUDEPATH += . \
            generators/win32 \
            generators/mac \
            generators/symbian \
+           generators/integrity \
            $$QT_SOURCE_TREE/include \
            $$QT_SOURCE_TREE/include/QtCore \
            $$QT_SOURCE_TREE/include/QtCore/$$QT_VERSION \