Qt Continuous Integration System [Mon, 9 May 2011 09:17:15 +0000 (19:17 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Added Wayland selection support.
Laszlo Agocs [Fri, 6 May 2011 16:36:43 +0000 (18:36 +0200)]
Added Wayland selection support.
Qt Continuous Integration System [Mon, 9 May 2011 05:43:57 +0000 (15:43 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Add qglobal.h exports for QtLocation & QtSensors
Alex [Mon, 9 May 2011 05:34:25 +0000 (15:34 +1000)]
Add qglobal.h exports for QtLocation & QtSensors
Plus the QtLocation configure options
Reviewed-By: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Qt Continuous Integration System [Sun, 8 May 2011 03:17:33 +0000 (13:17 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Install private headers into the correct location
Marius Storm-Olsen [Sun, 8 May 2011 03:08:42 +0000 (22:08 -0500)]
Install private headers into the correct location
The privates need to be under <MODULE NAME>/ since we use
#include <ModuleName/private/header_p.h>
in many places
Qt Continuous Integration System [Sat, 7 May 2011 03:27:01 +0000 (13:27 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Fix Makefile subtargets
Marius Storm-Olsen [Sat, 7 May 2011 03:19:51 +0000 (03:19 +0000)]
Fix Makefile subtargets
Commit
c04b7a55d131006cf1061f3456f4c63a7436801e broke subtargets
so every rule would just make 'first' (implicitly)
Qt Continuous Integration System [Fri, 6 May 2011 14:05:46 +0000 (00:05 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Fix QRawFont::setPixelSize() on Mac
Eskil Abrahamsen Blomfeldt [Fri, 6 May 2011 13:45:37 +0000 (15:45 +0200)]
Fix QRawFont::setPixelSize() on Mac
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)
Qt Continuous Integration System [Fri, 6 May 2011 09:53:21 +0000 (19:53 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* '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
Joerg Bornemann [Thu, 5 May 2011 08:51:27 +0000 (10:51 +0200)]
qmake vc(x)proj generator: support x64 Qt builds
Task-number: QTBUG-17911
Reviewed-by: ossi
Joerg Bornemann [Thu, 5 May 2011 12:04:22 +0000 (14:04 +0200)]
qmake: remove dead code from VcxprojGenerator
Reviewed-by: ossi
Qt Continuous Integration System [Fri, 6 May 2011 09:00:01 +0000 (19:00 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Fix QPainter::drawGlyphs() with non-affine transformation
Eskil Abrahamsen Blomfeldt [Fri, 6 May 2011 08:25:20 +0000 (10:25 +0200)]
Fix QPainter::drawGlyphs() with non-affine transformation
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)
Qt Continuous Integration System [Fri, 6 May 2011 08:41:31 +0000 (18:41 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging
* '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()
...
Qt Continuous Integration System [Fri, 6 May 2011 07:55:35 +0000 (17:55 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
QtUiTools: Remove Q3Support.
Olivier Goffart [Fri, 6 May 2011 07:54:24 +0000 (09:54 +0200)]
Merge remote-tracking branch 'mainline/master' into earth
Qt Continuous Integration System [Fri, 6 May 2011 07:35:50 +0000 (17:35 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
uic: Remove Q3Support.
Friedemann Kleint [Fri, 6 May 2011 07:33:45 +0000 (09:33 +0200)]
QtUiTools: Remove Q3Support.
Remove special handling of Q3ButtonGroup in form builder.
Friedemann Kleint [Fri, 6 May 2011 07:31:21 +0000 (09:31 +0200)]
uic: Remove Q3Support.
Remove code and tests.
Qt Continuous Integration System [Thu, 5 May 2011 18:21:17 +0000 (04:21 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Dont do doneCurrent in swapBuffers
Jørgen Lind [Thu, 5 May 2011 15:34:07 +0000 (17:34 +0200)]
Dont do doneCurrent in swapBuffers
Qt Continuous Integration System [Thu, 5 May 2011 14:27:25 +0000 (00:27 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Changelog: Qt Designer 4.8
Friedemann Kleint [Thu, 28 Apr 2011 13:32:46 +0000 (15:32 +0200)]
Changelog: Qt Designer 4.8
(cherry picked from commit
3a10cfc583f30be4dd98e1fcc3463c3d8bc14f31)
Qt Continuous Integration System [Thu, 5 May 2011 14:09:02 +0000 (00:09 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
compile openvg with private headers
Marius Storm-Olsen [Thu, 5 May 2011 13:58:59 +0000 (08:58 -0500)]
compile openvg with private headers
Taito Silvola [Thu, 5 May 2011 09:09:32 +0000 (12:09 +0300)]
QSslConfiguration documentation fix
setPeerVerifyMode() and peerVerifyMode() comments fix
Merge-request: 1220
Reviewed-by: Peter Hartmann
Qt Continuous Integration System [Thu, 5 May 2011 12:02:54 +0000 (22:02 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Remove misspelled comment in tst_qtextdocument.cpp
Qt Continuous Integration System [Thu, 5 May 2011 11:42:44 +0000 (21:42 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Only enable design metrics for scalable fonts
Add a way to retrieve CTFontRef from QFont
Jiang Jiang [Thu, 5 May 2011 11:17:26 +0000 (13:17 +0200)]
Only enable design metrics for scalable fonts
Bitmap fonts don't have linear advance at all.
Reviewed-by: Eskil
(cherry picked from commit
111accbf9aaf95b052448ecb70937c61e9b59d66)
Jiang Jiang [Wed, 4 May 2011 14:06:06 +0000 (16:06 +0200)]
Add a way to retrieve CTFontRef from QFont
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)
Eskil Abrahamsen Blomfeldt [Thu, 5 May 2011 11:43:13 +0000 (13:43 +0200)]
Remove misspelled comment in tst_qtextdocument.cpp
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)
Qt Continuous Integration System [Thu, 5 May 2011 00:34:08 +0000 (10:34 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* '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
...
Kent Hansen [Fri, 3 Sep 2010 08:49:46 +0000 (10:49 +0200)]
Add Q_UNIMPLEMENTED() macro
(cherry picked from commit
adce00979c30cc22d26ba43c15e0c7a3733b57ab)
Prasanth Ullattil [Wed, 4 May 2011 15:54:44 +0000 (17:54 +0200)]
Fix build error on Mac
To use the private headers, the .pro file should contain
QT += <module>-private
Reviewed-by: Olivier Goffart
Paul Olav Tvete [Wed, 4 May 2011 14:55:48 +0000 (16:55 +0200)]
Build fix
Friedemann Kleint [Wed, 4 May 2011 14:19:35 +0000 (16:19 +0200)]
BC cleanup in uitools.
Remove virtual functions obsoleted by new resource handling
in Qt Designer 4.4. Remove static hash of private objects
for formbuilder.
Requires
fd61c9b24d27452df3eb478a81d7e7725fe6f5b4 in qttools.
Rubber-stamped-by: axis
Jiang Jiang [Wed, 4 May 2011 13:44:32 +0000 (15:44 +0200)]
Fix framework absolute path issue
module.prf incorrectly overwrites INSTALLS which results the absolute
soname not prepended.
Reviewed-by: Marius Storm-Olsen
Peter Hartmann [Wed, 4 May 2011 11:50:40 +0000 (13:50 +0200)]
HTTP auto tests: do not load resources from cache that must be revalidtd
The header field "Cache-Control: must-revalidate" is a strict
requirement for loading the resource from the server, and not reading it
from the cache without revalidating first. With this patch, PreferCache
will load such from the network instead of loading them from the cache,
and AlwaysCache will throw a ContentNotFound error.
Reviewed-by: Markus Goetz
Task-number: QTBUG-18983
Peter Hartmann [Wed, 4 May 2011 11:49:51 +0000 (13:49 +0200)]
HTTP cache backend: do not load resources that must be revalidated
The header field "Cache-Control: must-revalidate" is a strict
requirement for loading the resource from the server, and not reading it
from the cache without revalidating first. With this patch, PreferCache
will load such from the network instead of loading them from the cache,
and AlwaysCache will throw a ContentNotFound error.
Reviewed-by: Markus Goetz
Task-number: QTBUG-18983
Peter Hartmann [Wed, 4 May 2011 12:33:21 +0000 (14:33 +0200)]
HTTP reply: do not load resources from cache that must be revalidated
The header field "Cache-Control: must-revalidate" is a strict
requirement for loading the resource from the server, and not reading it
from the cache without revalidating first. With this patch, PreferCache
will load such from the network instead of loading them from the cache,
and AlwaysCache will throw a ContentNotFound error.
Reviewed-by: Markus Goetz
Task-number: QTBUG-18983
Jiang Jiang [Tue, 3 May 2011 11:50:10 +0000 (13:50 +0200)]
Remove QFontEngineFT::loadGlyphMetrics
It is no longer used and was accidentally merged back in.
Reviewed-by: Eskil
(cherry picked from commit
782535ac548c582542bd1c17207e288e816870a8)
Jiang Jiang [Mon, 2 May 2011 12:13:06 +0000 (14:13 +0200)]
Add required font metrics functions to QRawFont
Reviewed-by: Eskil
(cherry picked from commit
2c8df8bfb679885c3cbd2ee02f5e4053fdd554c2)
Peter Hartmann [Wed, 27 Apr 2011 09:48:53 +0000 (11:48 +0200)]
QNetworkCookie: allow spaces in unquoted values
We should follow
http://tools.ietf.org/html/draft-ietf-httpstate-cookie-23 , which says
parse the value until reaching the next ';' or the end of the line.
Other cookie implementations allow spaces in unquoted values as well.
Reviewed-by: Martin Petersson
Task-number: QTBUG-18876
Gunnar Sletta [Wed, 4 May 2011 09:38:42 +0000 (11:38 +0200)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-staging
Eskil Abrahamsen Blomfeldt [Wed, 4 May 2011 08:52:20 +0000 (10:52 +0200)]
Include pixel size of font in exported HTML from QTextDocument
When you copy-pasted rich text in which the font size had been set
using setPixelSize() the font size would be mysteriously forgotten.
The pixel size property in QTextCharFormat was added ad hoc, and not
integrated in the HTML exporter.
Task-number: QT-4792
Reviewed-by: Gunnar
(cherry picked from commit
5aa5c2e2935c1829cc6965198968699f17c24ec0)
Gunnar Sletta [Wed, 4 May 2011 08:08:23 +0000 (10:08 +0200)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-staging
Gunnar Sletta [Wed, 4 May 2011 08:01:37 +0000 (10:01 +0200)]
Merge branch 'qtquick2'
Gunnar Sletta [Wed, 4 May 2011 08:01:30 +0000 (10:01 +0200)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtbase-staging into qtquick2
Gunnar Sletta [Wed, 4 May 2011 08:00:42 +0000 (10:00 +0200)]
Make it possible for animation driver to specify the advance time delta
Eskil Abrahamsen Blomfeldt [Wed, 4 May 2011 07:10:45 +0000 (09:10 +0200)]
Compile on Windows
The SPI_FONTSMOOTHINGCONTRAST macro is not defined everywhere. When
the code was refactored, the workaround for this was lost. This
resubmits the work-around to make it compile.
Reviewed-by: Samuel
(cherry picked from commit
4c3630c1fcd2b3008f540a8906a19c533604f36a)
Jørgen Lind [Tue, 3 May 2011 11:00:50 +0000 (13:00 +0200)]
Remove warnings
(cherry picked from commit
9625c564877414695a9706acf34bc8719018ef06)
Jørgen Lind [Tue, 3 May 2011 06:57:49 +0000 (08:57 +0200)]
Fix Wayland plugin so it works with the wayland bind api
This is mostly for the xcomposite api, but also we needed to readEvents
after doing a connect
(cherry picked from commit
16c054125949b8f8ceec9626156d8790254a63a2)
Kristian Høgsberg [Fri, 22 Apr 2011 01:14:43 +0000 (21:14 -0400)]
wayland: Track wayland changes
Pass version number when creating proxies, use wl_ prefix when looking
up interfaces and drop wl_egl_display.
(cherry picked from commit
c2adf9395214d711a3a40516c6c2afa64b3b4ca3)
con [Tue, 19 Apr 2011 14:15:09 +0000 (16:15 +0200)]
Support GL ES 2 with uikit.
For GL ES 2 teach the paint device about the fact that it
is doing rendering backed by a framebuffer object,
not a system framebuffer (which doesn't exist).
(cherry picked from commit
3b437a7706efbaaafdc4861393cbe21354cf4ee2)
Jørgen Lind [Wed, 20 Apr 2011 07:17:13 +0000 (09:17 +0200)]
Lighthouse: Fix virtual desktopwidget
(cherry picked from commit
69c759f5b84c2f6a44377e5f72cfe9d5bf7344c6)
Eskil Abrahamsen Blomfeldt [Tue, 3 May 2011 13:06:13 +0000 (15:06 +0200)]
Support gamma correction of text on GL
If the SRGB framebuffer extension in GL is available, we can support
gamma correction of text with a gamma of 2.1. On Mac this is
sufficient for gamma correcting subpixel antialiased text. Gray
antialiasing should not be gamma corrected on Mac.
On Windows, the user can potentially set the gamma value to anything
between 1.0 and 2.2 (or something like that). We support anything
that resembles 1.0 closely enough by pushing the text out without
any correction (like before). We also support anything that resembles
2.1 (the gamma hardcoded in GL's SRGB extension) by turning on the
extension before blending the text. In between the two, we'll use
gray antialiasing to avoid differing too much from the raster engine
(which is our reference in this.)
For gray antialiasing on Windows, we use a constant gamma of 2.3 which
has been determined by experimentation. Since this is close enough to
2.1 we do gamma correction with SRGB extension.
The distance limit of 0.2 is determined by some experimentation.
Reviewed-by: Samuel
(cherry picked from commit
79ba7cceca5e4029876ace2121edd25b08ae14ce)
Markus Goetz [Thu, 14 Apr 2011 08:27:07 +0000 (10:27 +0200)]
QNAM HTTP: Removes some comments
Markus Goetz [Wed, 13 Apr 2011 13:11:09 +0000 (15:11 +0200)]
QNAM HTTP: More comments
Markus Goetz [Wed, 13 Apr 2011 12:33:11 +0000 (14:33 +0200)]
QNAM HTTP: Implement abort() and close()
Markus Goetz [Wed, 13 Apr 2011 12:16:15 +0000 (14:16 +0200)]
QNAM HTTP: Comments
Markus Goetz [Wed, 13 Apr 2011 12:10:41 +0000 (14:10 +0200)]
QNAM: Function re-ordering
Peter Hartmann [Wed, 13 Apr 2011 10:29:01 +0000 (12:29 +0200)]
Revert "HTTP caching internals: fix logic for PreferNetwork and PreferCache"
This reverts commit
e5d27e7aeac984e46f3aa8de20160cc00fc63155.
do not change the cache logic fundamentally.
Peter Hartmann [Wed, 13 Apr 2011 10:15:26 +0000 (12:15 +0200)]
HTTP caching documentation: add some comments
Peter Hartmann [Wed, 13 Apr 2011 09:45:00 +0000 (11:45 +0200)]
Revert "HTTP caching internals: fix logic for PreferNetwork and PreferCache"
This reverts commit
11838861a23ace66307306cf9c96b3f1910e09a9.
Markus Goetz [Tue, 12 Apr 2011 15:32:18 +0000 (17:32 +0200)]
QNAM: Fix initialization order warnings
Markus Goetz [Tue, 12 Apr 2011 15:09:20 +0000 (17:09 +0200)]
QNAM: TODO comments for Qt 5
Markus Goetz [Tue, 12 Apr 2011 14:58:46 +0000 (16:58 +0200)]
QNAM HTTP: Fix upload progress signal
Peter Hartmann [Fri, 8 Apr 2011 13:08:05 +0000 (15:08 +0200)]
HTTP caching internals: fix logic for PreferNetwork and PreferCache
Peter Hartmann [Fri, 8 Apr 2011 12:54:45 +0000 (14:54 +0200)]
HTTP Network Reply Impl: return earlier when resource loaded from cache
Peter Hartmann [Fri, 8 Apr 2011 12:52:21 +0000 (14:52 +0200)]
HTTP Reply implementation: make cache validation method return bool
Peter Hartmann [Fri, 8 Apr 2011 12:47:21 +0000 (14:47 +0200)]
cache: rename validateCache() to loadFromCacheIfAllowed()
Markus Goetz [Fri, 8 Apr 2011 11:41:57 +0000 (13:41 +0200)]
QNAM: Fix proxy code after refactoring
Peter Hartmann [Fri, 8 Apr 2011 11:25:13 +0000 (13:25 +0200)]
fix build
Markus Goetz [Mon, 28 Mar 2011 12:56:26 +0000 (14:56 +0200)]
QNAM: Start new HTTP backend architecture
Markus Goetz [Mon, 28 Mar 2011 12:14:57 +0000 (14:14 +0200)]
QNAM: Copy files for new architecture
Markus Goetz [Tue, 5 Apr 2011 14:42:33 +0000 (16:42 +0200)]
QNAM: Improve internal proxyAuthenticationRequired()
Make it independent from the backend architecture
to improve refactorability.
Reviewed-by: Peter Hartmann
Markus Goetz [Tue, 5 Apr 2011 14:24:01 +0000 (16:24 +0200)]
QNAM: Improve internal authenticationRequired()
Make it independant from the backend architecture
to improve refactorability.
Reviewed-by: Peter Hartmann
axis [Tue, 3 May 2011 14:21:07 +0000 (16:21 +0200)]
Added .tag file with Git revision.
Joerg Bornemann [Tue, 3 May 2011 12:49:38 +0000 (14:49 +0200)]
new configure.exe binary
Joerg Bornemann [Tue, 3 May 2011 07:52:30 +0000 (09:52 +0200)]
qmake nmake generator: pass MAKEFLAGS to sub-make calls
Unlike other make tools nmake doesn't do this automatically.
Reviewed-by: ossi
Marius Storm-Olsen [Wed, 20 Apr 2011 18:57:51 +0000 (13:57 -0500)]
Move private headers into versioned subdirectory
This will allow us to expose private headers in a controlled manner,
and ensure that they are not used by accident. This also means that
we internally will have to enable the private headers for the
modules we wish to use in the project.
Marius Storm-Olsen [Thu, 7 Apr 2011 14:40:33 +0000 (09:40 -0500)]
Install syncqt, and ensure it runs fine for external modules
Prasanth Ullattil [Tue, 12 Apr 2011 11:50:27 +0000 (13:50 +0200)]
Moved QtUiTools to CONFIG
QtUiTools is a staic library now. If this is added to QT variable
qmake will treat this as a framework on Mac. This patch is to
avoid that.
Marius Storm-Olsen [Fri, 1 Apr 2011 10:47:28 +0000 (05:47 -0500)]
Add module.prf, and install MODULE_PRI for each module
Output warning if not present
Marius Storm-Olsen [Wed, 30 Mar 2011 16:59:54 +0000 (11:59 -0500)]
Make sure we don't always pull in modules from installed mkspecs
When building Qt, qmake should not pull in mkspecs from an installed
version, as this will lead to incorrect paths for the current build.
So, here we ensure only to pull in modules from there we detected the
qconfig.pri, and ensure we still handle the QMAKEPATH case used by
some.
Martin Petersson [Wed, 27 Apr 2011 10:36:53 +0000 (12:36 +0200)]
QNetworkConfigurationManager: Fix network polling.
startPolling() is called by each engine, so before it would start
multiple singleshot timers. So I moved the timer to the class
and check if it has already been started before it is activated
again. So that we just use one timer.
Task-number: QTBUG-17219
Reviewed-by: Iiro Kause
Reviewed-by: Kranthi Kuntala
(cherry picked from commit
2506b86828ca8140c2f22d85a4378df40899b132)
Martin Petersson [Thu, 28 Apr 2011 10:07:07 +0000 (12:07 +0200)]
QAbstractSocket: Fix waitForReadyRead infinite loop.
Make sure that waitForReadyRead times out if the read buffer is full.
Task-number: QTBUG-16123
Reviewed-by: Peter Hartmann
(cherry picked from commit
8d4cd52b6981a4e6deea7fdb77f56e40c4f3e6ba)
Martin Petersson [Tue, 26 Apr 2011 10:03:17 +0000 (12:03 +0200)]
Fix compile warning on Windows
Reviewed-by: Prasanth Ullattil
(cherry picked from commit
800ad68e4f000e65b0a83ef1da2a29d595964156)
Eskil Abrahamsen Blomfeldt [Mon, 2 May 2011 08:06:44 +0000 (10:06 +0200)]
Make pixel size a qreal in QRawFont
The pixel size in the font engines is already a floating point value.
For maximum flexibility, we should expose this in the public API.
Task-number: QTBUG-18817
Reviewed-by: Jiang Jiang
(cherry picked from commit
ac9e63b58533a3215106ed9da82cff3a3e3dda3a)
Dmitry Zelenkovsky [Thu, 28 Apr 2011 09:49:13 +0000 (11:49 +0200)]
Support more items for QTextCharFormat::VerticalAlignment enum for custom text objects.
* QTextCharFormat::AlignNormal - support text format descent, place text object bottom on (baseline - descent).
* QTextCharFormat::AlignBottom - place text object bottom on baseline.
* QTextCharFormat::AlignTop - Still not supported.
* Any other vertical alignment is mapped QTextCharFormat::AlignBottom.
Add new enum AlignBaseline for custom inline objects to take into account font baseline.
Merge-request: 2578
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
(cherry picked from commit
ee9455ed2a83084692d969c398ecb91bcd4fc33a)
Jiang Jiang [Wed, 27 Apr 2011 14:05:09 +0000 (16:05 +0200)]
Use maximum ascent/descent/leading from fallback fonts in shaping
When shaping a QScriptItem with a multi font engine, currently we
only take the ascent/descent/leading from the primary (first) font
engine in that multi font engine, however, subsequent engines used
during shaping may have larger ascent/descent/leading, disregarding
them may cause clipping issues in some cases.
It's fixed by checking each font engine used in the shaping process
and take the maximum value instead of the first one. On ATSUI we
merely make it compile.
Task-number: QTBUG-16719
Reviewed-by: Eskil
(cherry picked from commit
c501403cb5a0c9ec21b00e0c2f640ae85566e0cf)
Jiang Jiang [Wed, 27 Apr 2011 09:39:09 +0000 (11:39 +0200)]
Another ugly hack to make bidi cursor work with Core Text
If the text is wrapped with LRE/LRO/RLE/RLO override/embed marks,
Core Text in Mac OS X 10.5 doesn't produce an empty glyph at the
beginning of the glyphs (while it does in Mac OS X 10.6), thus
we need to prepend an empty glyph here, otherwise cursor position
calculation will consider the first two characters as a ligature
of the same glyph.
Reviewed-by: Eskil
(cherry picked from commit
a36ac6c34bafa801c2c30d76f59e4a3594efc4d5)
Jiang Jiang [Wed, 27 Apr 2011 06:47:46 +0000 (08:47 +0200)]
Make sure layoutData exist before checking for string direction
Otherwise accessing that through QTextEngine::alignLine may cause crash.
Reviewed-by: Samuel Rødal
(cherry picked from commit
dcdb62c3d1a76d951c4b65bc1b1bd930e2ad14ec)
Jiang Jiang [Tue, 19 Apr 2011 12:40:19 +0000 (14:40 +0200)]
Take leading space width into account for painting and selection
When painting horizontally centered RTL text and selection with
trailing spaces, we need to take that space width into account
because line.textAdvance doesn't include it.
Task-number: QTBUG-18612
Reviewed-by: Eskil
(cherry picked from commit
224226727f07e8940e0d3131fe7587b11cc4a6ca)
Jiang Jiang [Wed, 20 Apr 2011 08:19:02 +0000 (10:19 +0200)]
Remove extra comma at the end of enum list
It fails compilerwarnings test.
Reviewed-by: TrustMe
(cherry picked from commit
1e847c00dcf4948b8892d0a552576e1d3ea554b9)
Jiang Jiang [Tue, 19 Apr 2011 10:48:19 +0000 (12:48 +0200)]
Don't transform glyph positions for Core Graphics paint engine
Since it already transformed text positions based on transform matrix
on QPainter.
Reviewed-by: Eskil
(cherry picked from commit
b86c9120710bf1481df5f6541618169a82fd65b8)
Jiang Jiang [Mon, 18 Apr 2011 15:08:30 +0000 (17:08 +0200)]
Turn on HarfBuzz support for Mac/Cocoa
It's possible to enable HarfBuzz text layout on Mac by either:
- Set QT_ENABLE_HARFBUZZ environment variable when running a Qt
app.
- configure with -harfbuzz to build Qt, then HarfBuzz support
will be turned on by default.
HarfBuzz will only be used when the font explicitly requested
is supported by HarfBuzz (aka. TrueType/OpenType font), other
fonts (AAT fonts) will still be handled by Core Text.
Using HarfBuzz for text layout will hopefully solve most tricky
complex text shaping bugs on Mac.
Task-number: QTBUG-17728
Reviewed-by: Eskil
Jiang Jiang [Wed, 15 Dec 2010 14:11:45 +0000 (15:11 +0100)]
Support visual cursor movement for BIDI text
Bidi input can in some contexts be more intuitive if the cursor
works in visual way: pressing left arrow key always make cursor
move one character to the left regardless the language of text,
pressing right arrow key always make cursor move to the right.
It is also the behavior of Mac OS X. Based on the above reason
and requests from Symbian we implemented this support for visual
movement in BIDI text. 3 public properties are added to
QTextDocument, QTextLayout and QLineEdit respectively:
- QTextDocument::defaultCursorMoveStyle can be used to control
the cursor behavior in all widgets based on QTextDocument,
like QTextEdit, QPlainTextEdit, etc. When set to QTextCursor::
Visual, it will enable visual movement for all the cursors in
the corresponding text edit. Default is QTextCursor::Logical.
- QTextLayout::cursorMoveStyle is used for low-level cursor
manipulation. When set to Visual, it will enable visual movement
behavior for all the cursor related methods, including cursorToX,
xToCursor and drawCursor. Default is Logical.
- QLineEdit::cursorMoveStyle is used to control cursor movement
behavior in QLineEdit. Default is Logical.:
Task-number: QTBUG-13859
Reviewed-by: Eskil
(cherry picked from commit
c480dd641f5d22d1ee72cb27bf39e24c6df65658)