summaryrefslogtreecommitdiffstats
path: root/examples/network/network-chat
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-15 06:06:14 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-15 06:06:14 (GMT)
commit414ff1be28af440f1e01a38e497227f3849e8e54 (patch)
treec4f0d6d280880b5dce165421b6a48567c86f9288 /examples/network/network-chat
parent6ce4e6247fa6e438a34a498cd803a5542ff338b7 (diff)
parent904494979d2292ca2be702467ff6e288106444d5 (diff)
downloadQt-414ff1be28af440f1e01a38e497227f3849e8e54.zip
Qt-414ff1be28af440f1e01a38e497227f3849e8e54.tar.gz
Qt-414ff1be28af440f1e01a38e497227f3849e8e54.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: (24 commits) Fix MOBILITY-404 Remove holes in bearer management data structures. Don't link bearer plugins against QtGui unnecessarily. Added missing newline after warning message when using -L with qml Doc: updating scripts Fixed a crash on embedded due to uninitialized pointer. Fix a race where QThread::exit() is "lost" when called after start() qdoc: Removed all <table> attributes in favor of using css. Autotest failure: dialogModality test fails on cocoa (macgui) Force the bic test to compile in 32-bit mode on Mac Revert "Doc: Updating design files." Remove statically allocated pixmaps through the post routine qdoc: Checked for empty title. qdoc: Added TOC to class ref pages. Cocoa: qwidget autotest fails on setToolTip Compile on Mac OS 10.4 Bearer management changes from Qt Mobility (7a5ff985) Partially revert "Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors" Fix margins for placeholdertext in QLineEdit qdoc: Added TOC to module pages. ...
Diffstat (limited to 'examples/network/network-chat')
0 files changed, 0 insertions, 0 deletions