summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-23 22:21:50 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-23 22:21:50 (GMT)
commite5722f539888913b9bea4f91db95f5e2c5fceed1 (patch)
treef1562de5cd28fa782d6285970c928972de1fb50c /mkspecs
parent3ac06f540761fa259317f773c8a4517e252623a3 (diff)
parent51955cb4ca94b2a700cb276714bec77bdb1bc934 (diff)
downloadQt-e5722f539888913b9bea4f91db95f5e2c5fceed1.zip
Qt-e5722f539888913b9bea4f91db95f5e2c5fceed1.tar.gz
Qt-e5722f539888913b9bea4f91db95f5e2c5fceed1.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: We need to swallow the event, otherwise it might pop up several times. Set the item data thru the model, so we actually emit dataChanged. There where still references to the old Assistant. Newly created folders in QFileDialog are disabled on Cocoa. don't remove the path from the name of included files add some comments remove support for QMAKE_POST_INCLUDE_FILES remove unused function fix prompt() stdin safety check Improve text performance with QtWebKit in Qt 4.7 Removed support for static linking of QtWebKit. When a drag is finished with on Mac, then it should delete itself
Diffstat (limited to 'mkspecs')
0 files changed, 0 insertions, 0 deletions