diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-06 10:31:01 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-06 10:31:01 (GMT) |
commit | 8ae162d2cffc1f220cb59df5f6417204e04da2c3 (patch) | |
tree | b7011461c9a7ca79954ff0134f5d47cffa10535a /tests/auto/qtcpsocket/tst_qtcpsocket.cpp | |
parent | 9754c200aa325614e05e6b00e3adedbdda1d161a (diff) | |
parent | 4b81cb847647450f4bad8a0d9a278d43ebdfecc6 (diff) | |
download | Qt-8ae162d2cffc1f220cb59df5f6417204e04da2c3.zip Qt-8ae162d2cffc1f220cb59df5f6417204e04da2c3.tar.gz Qt-8ae162d2cffc1f220cb59df5f6417204e04da2c3.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: (32 commits)
Fixed a buffer overrun when pasting large data from non-Qt apps
Fix copying large data to non-Qt applications
fix regexp in "make custom command handling in vc(x)proj files sane"
qmake: Include -pthread when reducing duplicate library arguments
qmake: Ensure right library order when reducing duplicate libraries
rebuild configure.exe
make QMAKE_POST_LINK handling in nmake generator sane
make custom command handling in vc(x)proj files sane
Revert "QWorkspace: fix hardcoded min size overwriting the real min size"
QtScript/JavaScriptCore: Backport random number generator seeding fix
Fix performance regression in QUuid::createUuid()
Update japanese translations.
Ensure that the underline is only drawn when expected for an accel
Small improvement in the textedit demo
My changes for 4.7.1
QWorkspace: fix hardcoded min size overwriting the real min size
Doc: Fixing link titles and error color in search results
Doc: Implementing features to the search feature.
Setting the _NET_WM_STATE Atom only when its not already set
Fix focus appearance of tabwidget tabs with QGtkStyle
...
Diffstat (limited to 'tests/auto/qtcpsocket/tst_qtcpsocket.cpp')
0 files changed, 0 insertions, 0 deletions