summaryrefslogtreecommitdiffstats
path: root/header.FDL
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-11-19 17:22:27 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-11-19 17:22:27 (GMT)
commit5327f223b5087c0097f5c608ed753a150f6190ff (patch)
treeb3b0e5f14b2190c8a32125f4e3bdad54a345bcf8 /header.FDL
parentd11e18b654de3c9e36455b5d6447a9d6273a6e2a (diff)
parenteaa0529642c90de3ebc07d819c0c0e8ed96a79be (diff)
downloadQt-5327f223b5087c0097f5c608ed753a150f6190ff.zip
Qt-5327f223b5087c0097f5c608ed753a150f6190ff.tar.gz
Qt-5327f223b5087c0097f5c608ed753a150f6190ff.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: Fix compilation with Sun Studio 12.1. Compile with QT_NO_PROXYSCREEN. silence compiler warnings Don't let posted events starve native dialogs (regression)
Diffstat (limited to 'header.FDL')
0 files changed, 0 insertions, 0 deletions