summaryrefslogtreecommitdiffstats
path: root/qmake/Makefile.win32-g++
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-01-11 22:59:05 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-01-11 22:59:05 (GMT)
commitf08189b8d7abb17e2694c4049184bbbf7837fd19 (patch)
tree463c5b242c8411bad5e61408536b5e35726f0a56 /qmake/Makefile.win32-g++
parent6900cf8d7cb8d1e98f3af2ac7ce909dc3b5fc2ef (diff)
parent3efc651f6695ec224374bf29ad5b695a8e492a65 (diff)
downloadQt-f08189b8d7abb17e2694c4049184bbbf7837fd19.zip
Qt-f08189b8d7abb17e2694c4049184bbbf7837fd19.tar.gz
Qt-f08189b8d7abb17e2694c4049184bbbf7837fd19.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: (71 commits) QNAM HTTP Code: Cache socket state inside ensureConnection() tst_qhttpnetworkconnection: Test also HEAD in some tests tst_qhttpnetworkconnection: Relax condition in getMultipleWithPriorities QNAM HTTP Code: When starting new request, prefer connected sockets. typo fix Added the 'framecapture' WebKit example to the default build. Fix code example fix typo in qreadwritelock's documentation QNAM HTTP: Don't call d_func() so often QNAM HTTP: Fix readBuffer maximum size. QNAM HTTP: Optimize eatWhitespace() QNAM HTTP: Check if socket already tries to connect. network internals: fix build on S60 [syncqt] Make -separate-module work with WebKit's directory structure doc: Corrected explanation of when append() does nothing. doc: Added clarification about allocating space for the 0 terminator. Add a way to access the normalised URL in QUrl. [syncqt] Make it possible to synchronize headers for a separate module [syncqt] Make it possible to override the base directory network internals: start HTTP GET requests right away when called ...
Diffstat (limited to 'qmake/Makefile.win32-g++')
0 files changed, 0 insertions, 0 deletions