summaryrefslogtreecommitdiffstats
path: root/qmake/qmake.pri
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-05-20 04:51:29 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-05-20 04:51:29 (GMT)
commite484ee27f929aca738a269947237d834dab89b39 (patch)
tree216f95598411eb4c72141308973695d5e0d8b372 /qmake/qmake.pri
parentded29009f766a8373193d94bcb8309270f66a266 (diff)
parentd1f1f2c91f63609ca1ffad32efdd6590f9f0ce6a (diff)
downloadQt-e484ee27f929aca738a269947237d834dab89b39.zip
Qt-e484ee27f929aca738a269947237d834dab89b39.tar.gz
Qt-e484ee27f929aca738a269947237d834dab89b39.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'qmake/qmake.pri')
-rw-r--r--qmake/qmake.pri1
1 files changed, 0 insertions, 1 deletions
diff --git a/qmake/qmake.pri b/qmake/qmake.pri
index 02ff38e..9147ee8 100644
--- a/qmake/qmake.pri
+++ b/qmake/qmake.pri
@@ -79,7 +79,6 @@ bootstrap { #Qt code
qfile.h \
qabstractfileengine.h \
qfileinfo.h \
- qfileinfo_p.h \
qglobal.h \
qnumeric.h \
qhash.h \