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()
...
Create a special to_be_moved directory, that will contain files
that are to be moved from QtWidgets to QtGui. This will allow
us to do a first split of the libraries rather fast and we can
then start pulling in these classes one by one.
Since macFontID restricts to quint32, we have to return that in
QFont::handle.
Task-number: QTBUG-17890
Reviewed-by: Eskil
(cherry picked from commit c8f299b7e675c839b16d750cd2633a57cdd0526f)
The comment was copy-pasted, spelling error and all, from the example
in the bug report, and really doesn't make any sense at all in this
context.
Reviewed-by: TrustMe
(cherry picked from commit 7ac511d8d906575dff1a02361e31251b244d3b3a)
The class is only used for QGraphicsEffect. When merging
QtOpenGL into Gui and Widgets, the GL nased pixmap
filters will also need to be moved into effects/ and
the pixmapFilter() method in QPaintEngineEx can get
removed.
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: (46 commits)
Add Q_UNIMPLEMENTED() macro
Fix build error on Mac
Build fix
BC cleanup in uitools.
Fix framework absolute path issue
Remove QFontEngineFT::loadGlyphMetrics
Add required font metrics functions to QRawFont
Include pixel size of font in exported HTML from QTextDocument
Make it possible for animation driver to specify the advance time delta
Compile on Windows
Remove warnings
Fix Wayland plugin so it works with the wayland bind api
wayland: Track wayland changes
Support GL ES 2 with uikit.
Lighthouse: Fix virtual desktopwidget
Support gamma correction of text on GL
Added .tag file with Git revision.
new configure.exe binary
qmake nmake generator: pass MAKEFLAGS to sub-make calls
Move private headers into versioned subdirectory
...
