summaryrefslogtreecommitdiffstats
path: root/qmake/qmake.pro
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-04-27 08:45:30 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-04-27 08:45:30 (GMT)
commit9cea45515ef283c9a870c6f515da50d31addafcf (patch)
treed14fdf2b17a2a52c90ac514c39ad60be200cc7d7 /qmake/qmake.pro
parent6749edd4c6f647c4963793183a452bb1ae769c1c (diff)
parent13dff164d2ab13b1258d31693b67acebc8636890 (diff)
downloadQt-9cea45515ef283c9a870c6f515da50d31addafcf.zip
Qt-9cea45515ef283c9a870c6f515da50d31addafcf.tar.gz
Qt-9cea45515ef283c9a870c6f515da50d31addafcf.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'qmake/qmake.pro')
-rw-r--r--qmake/qmake.pro3
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/qmake.pro b/qmake/qmake.pro
index f3f9d53..4213253 100644
--- a/qmake/qmake.pro
+++ b/qmake/qmake.pro
@@ -19,7 +19,8 @@ VPATH += $$QT_SOURCE_TREE/src/corelib/global \
$$QT_SOURCE_TREE/src/corelib/plugin \
$$QT_SOURCE_TREE/src/corelib/xml \
$$QT_SOURCE_TREE/src/corelib/io
-INCPATH += generators \
+INCPATH += . \
+ generators \
generators/unix \
generators/win32 \
generators/mac \