diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-19 17:09:43 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-19 17:09:43 (GMT) |
commit | e4094573595ba085ccbd9d968fa87e988c5bfc5b (patch) | |
tree | 639a86a5033969ebf3be2ad3f925923a165a67f8 /qmake/Makefile.win32 | |
parent | 0f01ad8c73e352a8368296820f4dd77f9da06114 (diff) | |
parent | 7ce06afb341240b102edcc83b33d0da3d9e7ab5e (diff) | |
download | Qt-e4094573595ba085ccbd9d968fa87e988c5bfc5b.zip Qt-e4094573595ba085ccbd9d968fa87e988c5bfc5b.tar.gz Qt-e4094573595ba085ccbd9d968fa87e988c5bfc5b.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
tst_qnetworkreply: Check if TCP/HTTP connection got re-used
Fix building in a namespace on Windows
Ensure that posted events are sent on Windows
Diffstat (limited to 'qmake/Makefile.win32')
0 files changed, 0 insertions, 0 deletions