summaryrefslogtreecommitdiffstats
path: root/qmake/project.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-11-04 01:22:00 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-11-04 01:22:00 (GMT)
commitb59b90678d061bf5935a47385be7f2a31e8eb935 (patch)
tree08d2dc23d2f7bfcd9a492f74480a17d2b9380c4b /qmake/project.cpp
parent877505bc0029925598c754d535515ab9b4f027a2 (diff)
parent1718fd2e7745da7412f80352c466e02810c4a526 (diff)
downloadQt-b59b90678d061bf5935a47385be7f2a31e8eb935.zip
Qt-b59b90678d061bf5935a47385be7f2a31e8eb935.tar.gz
Qt-b59b90678d061bf5935a47385be7f2a31e8eb935.tar.bz2
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Qt/Symbian: QInputDialog layout and size are wrong make the dtd reflect reality Fixed destination path for the S60 feedback plugin. german translation: minor additions + fixes fix qdoc doc generation
Diffstat (limited to 'qmake/project.cpp')
0 files changed, 0 insertions, 0 deletions