summaryrefslogtreecommitdiffstats
path: root/examples/examples.pro
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-04 11:22:17 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-04 11:22:17 (GMT)
commitce7462aaa6826bd81f0f9164a3561d8e2dfb99e8 (patch)
tree473323943ab1d9d38881a6a6b888935d95abbf6f /examples/examples.pro
parentc1bac607f3f3889d367e20c128acf30dc9537ddc (diff)
parent28fcd720d3c4090fa915f9638c56dcb389220da6 (diff)
downloadQt-ce7462aaa6826bd81f0f9164a3561d8e2dfb99e8.zip
Qt-ce7462aaa6826bd81f0f9164a3561d8e2dfb99e8.tar.gz
Qt-ce7462aaa6826bd81f0f9164a3561d8e2dfb99e8.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: Assistant: Include QML docs Fixed the curve descriptions and added descriptions for overshoot, amplitude, and period. Fix for QTBUG-7940. Cocoa: Showing a QFontDialog first shows it in the bottom-left corner Mac: fix regression from 65a673f that makes some buttons unclickable Fix deadlocks in ICD and NetworkManager engines. new icons for cell and bt networks. Doc: updating getting started docs - not finished Doc: removing empty links in bread crumb add convience methods for getting ethernet service details. fix spelling fix crash try harder to get cell name
Diffstat (limited to 'examples/examples.pro')
0 files changed, 0 insertions, 0 deletions