summaryrefslogtreecommitdiffstats
path: root/examples/network/network-chat/network-chat.pro
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-17 21:53:22 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-17 21:53:22 (GMT)
commitf9ca0df998a8a3a942816f2954603ad996210d8d (patch)
tree2310a77cf20d10609603c04f7d1bf29e9aec8042 /examples/network/network-chat/network-chat.pro
parent4c1f54097a1fb1acff817ba8caa8af347ae56cd2 (diff)
parent0a5bcc8a0ab57becc36b140954b7034b3d11efbc (diff)
downloadQt-f9ca0df998a8a3a942816f2954603ad996210d8d.zip
Qt-f9ca0df998a8a3a942816f2954603ad996210d8d.tar.gz
Qt-f9ca0df998a8a3a942816f2954603ad996210d8d.tar.bz2
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Use AudioConverter when not preferred format. Handle values passed to setNotifyInterval more robustly. Make sure to check for a valid audioformat before open. Implement symbian^3 e32atomics API Fix runonphone target due to changed name of sis files Fix fromSymbian*() image conversion functions. Fixed cleartype text rendering on translucent surfaces. Make QColorDialog usable on small screens Added exit softkey to Wiggly example
Diffstat (limited to 'examples/network/network-chat/network-chat.pro')
0 files changed, 0 insertions, 0 deletions