When socks socket engine calls the write function of the native socket
engine, it now propagates errors to the abstract socket.
Task-number: QTBUG-18713
Reviewed-by: Markus Goetz
The script goes through all includes of the style of
and changes them to <QtWidget/QAction>
Simply run over your source code to get most compile
errors due to classes that moved between different
Qt libraries fixed.
When refactoring the setPixelSize() code of QRawFont, it was broken
on Mac. To avoid making the same mistake again, I've added a simple
autotest to check that the pixel size is actually set.
Reviewed-by: Jiang Jiang
(cherry picked from commit 821b8b540af491ce60d35bd84d3c91399ecc0d16)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
qmake vc(x)proj generator: support x64 Qt builds
qmake: remove dead code from VcxprojGenerator
When the matrix has an non-affine transformation, the text will have to
be rendered using the default path-renderer. This means going through
the drawTextItem() path (since drawStaticText() has no support for those
transformations) and it also means not pre-transforming the coordinates,
since the default implementation of drawTextItem() supports
transformations.
Task-number: QTBUG-18214
Reviewed-by: Jiang Jiang
(cherry picked from commit 55446d104db77fc7994ab12352b1c08bb7b63346)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging: (26 commits)
QSslConfiguration documentation fix
HTTP auto tests: do not load resources from cache that must be revalidtd
HTTP cache backend: do not load resources that must be revalidated
HTTP reply: do not load resources from cache that must be revalidated
QNetworkCookie: allow spaces in unquoted values
QNAM HTTP: Removes some comments
QNAM HTTP: More comments
QNAM HTTP: Implement abort() and close()
QNAM HTTP: Comments
QNAM: Function re-ordering
Revert "HTTP caching internals: fix logic for PreferNetwork and PreferCache"
HTTP caching documentation: add some comments
Revert "HTTP caching internals: fix logic for PreferNetwork and PreferCache"
QNAM: Fix initialization order warnings
QNAM: TODO comments for Qt 5
QNAM HTTP: Fix upload progress signal
HTTP caching internals: fix logic for PreferNetwork and PreferCache
HTTP Network Reply Impl: return earlier when resource loaded from cache
HTTP Reply implementation: make cache validation method return bool
cache: rename validateCache() to loadFromCacheIfAllowed()
...
