summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-07-11 15:24:55 +0200
committerQt by Nokia <qt-info@nokia.com>2011-07-11 15:50:59 +0200
commit968596588b2b919aeccef64c2f932dca3e12b72a (patch)
treeac4190d59e38d4e8d883d259eb4c71931d87518d
parent0c0676ada2cc3943d09f8eb1e75491b80f08f27b (diff)
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>
-rw-r--r--qmake/qmake.pri2
-rw-r--r--qmake/qmake.pro1
2 files changed, 3 insertions, 0 deletions
diff --git a/qmake/qmake.pri b/qmake/qmake.pri
index d6c5f09107..79794e751c 100644
--- 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 ac52bd8dd0..6c7d0d2f19 100644
--- 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 \