Qt Continuous Integration System [Tue, 10 May 2011 10:26:33 +0000 (20:26 +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:
Rename QGlyphs -> QGlyphRun
Eskil Abrahamsen Blomfeldt [Tue, 10 May 2011 07:43:00 +0000 (09:43 +0200)]
Rename QGlyphs -> QGlyphRun
API clean-up for QGlyphRun:
1. QGlyphs -> QGlyphRun
2. QGlyphRun's font()/setFont() -> rawFont()/setRawFont()
3. QPainter::drawGlyphs() -> drawGlyphRun()
4. QTextLayout and QTextFragment's glyphs() -> glyphRuns()
Reviewed-by: Jiang Jiang
(cherry picked from commit
84ef364302728b68d2d29ea9c4ccbec32c7bb115)
Qt Continuous Integration System [Tue, 10 May 2011 10:07:16 +0000 (20:07 +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:
Respect capacity in QVector::append().
Qt Continuous Integration System [Tue, 10 May 2011 09:50:02 +0000 (19:50 +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 internal documentation for QUnifiedToolbarSurface.
Fix the autotest condition.
Change the repaint() call to an update().
Fix the update() autotest for raster.
Change the repaint() to an update().
Set the default graphics system to raster.
Revert "Switch the default graphics system to raster on Mac."
Fix an race condition in the auto test.
Fix an race condition in the auto test.
Fix a race condition when the main window is being destructed.
Switch the default graphics system to raster on Mac.
Fabien Freling [Fri, 6 May 2011 11:31:43 +0000 (13:31 +0200)]
Add internal documentation for QUnifiedToolbarSurface.
This document is aimed for developers. This is why
it is directly written in the header file. This is
not part of the public API.
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit
891b6ac7236d21b69bdb54b00051422cee004059)
Fabien Freling [Tue, 3 May 2011 12:29:36 +0000 (14:29 +0200)]
Fix the autotest condition.
The previous preprocessor directive was aimed to
exclude Mac OS X.
With the raster engine, the behavior is unified
and we don't need to have a separate path for
Mac OS X/Cocoa.
The new condition excludes only Mac OS X with a
graphics system other than raster or Carbon.
Reviewed-by: Jiang Jiang
(cherry picked from commit
2c6af885d959f90b801c74dc5d389a720dc9fd1d)
Fabien Freling [Tue, 3 May 2011 12:28:56 +0000 (14:28 +0200)]
Change the repaint() call to an update().
In show_sys(), if we directly call repaint() this
will triggers too many UpdateRequest events.
This fixes the qwidget autotest
"compatibilityChildInsertedEvents".
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit
747962e6ec20a59b7e2ed67c5cd685258f199a86)
Fabien Freling [Mon, 2 May 2011 08:52:25 +0000 (10:52 +0200)]
Fix the update() autotest for raster.
With the CoreGraphics engine, we expect the test
to fail with update(), but with the raster
engine the behavior is the same across platforms.
Hence we don't need a special case for Mac OS X
with the raster engine.
Reviewed-by: Samuel Rødal
(cherry picked from commit
75d2387fbf005b022437855ab6433790372639f8)
Fabien Freling [Fri, 29 Apr 2011 10:26:08 +0000 (12:26 +0200)]
Change the repaint() to an update().
Forcing to repaint might cause a recursive
repaint. Since there is no apparent reason to
directly repaint, we just call update().
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit
244fedd484b022881b906b1bc794d5af19d02843)
Fabien Freling [Tue, 26 Apr 2011 10:34:00 +0000 (12:34 +0200)]
Set the default graphics system to raster.
This change is specific to Mac OS X/Cocoa.
Reviewed-by: Lars Knoll
(cherry picked from commit
2c2026df66f237b7313397dd74f6bc3212b94596)
Fabien Freling [Mon, 18 Apr 2011 09:49:57 +0000 (11:49 +0200)]
Revert "Switch the default graphics system to raster on Mac."
This reverts commit
a5d40fd3814ab7c8e865912c03a918bfd5994998.
We have to fix the regressions due to the raster engine before putting
it by default.
(cherry picked from commit
3197fe2af911673c6291db0102e90a0d7f6ae926)
Fabien Freling [Fri, 15 Apr 2011 13:05:03 +0000 (15:05 +0200)]
Fix an race condition in the auto test.
Deleting the page in the wizard without removing it
first leads to a crash when the wizard tries to
access a deleted page.
Reviewed-by: Samuel Rødal
(cherry picked from commit
4024a08239c3e69bb2e0ca045ccbdf3fc900f675)
Fabien Freling [Thu, 14 Apr 2011 17:12:59 +0000 (19:12 +0200)]
Fix an race condition in the auto test.
Deleting the page in the wizard without removing it
first leads to a crash when the wizard tries to
access a deleted page.
Reviewed-by: jasplin
(cherry picked from commit
3bff1637cd49617d334c1be63c20e008fac93be1)
Fabien Freling [Tue, 12 Apr 2011 14:23:57 +0000 (16:23 +0200)]
Fix a race condition when the main window is being destructed.
During the destructor of QWidget, we delete the
layout. If the layout is not set to 0 afterwards,
a check on the layout might turn true, but any access
will end with a segfault.
Reviewed-by: João Abecasis
(cherry picked from commit
abc5a632942c23496d75c49b3b0b4a674cdafdf8)
Liang Qi [Tue, 10 May 2011 09:38:53 +0000 (11:38 +0200)]
Respect capacity in QVector::append().
Fix a bug in QVector::append(), it should use the capacity for new size,
when it is implicit shared and capacity is bigger than the new size.
Autotest included.
Task-number: QTBUG-11763
Reviewed-by: joao
Reviewed-by: Olivier Goffart
Fabien Freling [Mon, 11 Apr 2011 10:56:56 +0000 (12:56 +0200)]
Switch the default graphics system to raster on Mac.
Reviewed-by: Lars Knoll
(cherry picked from commit
a5d40fd3814ab7c8e865912c03a918bfd5994998)
Qt Continuous Integration System [Tue, 10 May 2011 09:19:12 +0000 (19:19 +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:
Fixed detection of QtBase directory.
axis [Tue, 10 May 2011 08:30:30 +0000 (10:30 +0200)]
Fixed detection of QtBase directory.
The old check would fail for an installed copy of Qt. Instead, base
the check on using QTDIR if it present, otherwise use the parent of
the bin directory, and then check that "mkspecs" is present.
Reviewed-by: Olivier Goffart
Qt Continuous Integration System [Tue, 10 May 2011 08:17:06 +0000 (18: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:
Remove const from QPlatformClipboard::mimeData().
Laszlo Agocs [Tue, 10 May 2011 08:09:44 +0000 (10:09 +0200)]
Remove const from QPlatformClipboard::mimeData().
Most implementations will anyway do non-const operations in there, the
change avoids the need for const_cast or mutable.
Qt Continuous Integration System [Tue, 10 May 2011 07:54:22 +0000 (17:54 +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:
Retrieve the actual data in the Wayland clipboard only when requested.
Qt Continuous Integration System [Tue, 10 May 2011 07:24:49 +0000 (17:24 +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 QDefaultAnimationDriver
Laszlo Agocs [Tue, 10 May 2011 07:17:27 +0000 (09:17 +0200)]
Retrieve the actual data in the Wayland clipboard only when requested.
Alan Alpert [Tue, 10 May 2011 03:43:58 +0000 (13:43 +1000)]
Fix QDefaultAnimationDriver
Animation drivers were changed to used signals instead of virtual
functions, but the default animation driver was left behind.
Reviewed-by: Michael Brasser
Qt Continuous Integration System [Mon, 9 May 2011 15:16:35 +0000 (01:16 +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:
Turned on private headers for some plugins.
Jonni Rainisto [Mon, 9 May 2011 14:55:33 +0000 (16:55 +0200)]
Turned on private headers for some plugins.
Reviewed-by: axis
Qt Continuous Integration System [Mon, 9 May 2011 11:54:18 +0000 (21:54 +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:
Skip test on MacOS due to problems with corewlan plugin
Fix QNetworkConfigurationManager usage outside main thread first
Update QTBUG-17223 for Qt 4.8
fix tst_qnetworkreply::httpProxyCommands autotest
Send User-Agent from the network request in http proxy CONNECT command
Add autotests for configuration dependent network proxies
Fix QNetworkReplyImpl error handling
Enable per network configuration proxy settings in QNetworkAccessManager
Allow a network configuration to be included in a proxy query
Fix error handling in write for socks socket engine
Shane Kearns [Thu, 5 May 2011 12:53:17 +0000 (13:53 +0100)]
Skip test on MacOS due to problems with corewlan plugin
Reviewed-by: Cristiano di Flora
Shane Kearns [Wed, 4 May 2011 12:02:57 +0000 (13:02 +0100)]
Fix QNetworkConfigurationManager usage outside main thread first
QNetworkConfigurationManager creates the engines loaded from plugins
as objects in the main thread.
If a QNetworkConfigurationManager instance is created in a worker thread
without any instance previously existing in the main thread, then it
is uninitialised until the main thread has run.
This causes allConfigurations() to return an empty list if called
immediately after instantiation, for example.
This fix initialises the plugins using blocking queued connections,
which causes the worker thread to block until the initialisation function
has been called in the context of the main thread.
Deadlock is possible if the main thread is for some reason waiting on the
worker thread, but it will not deadlock on QNetworkConfigurationManager's
mutex.
If this is a problem for an application, it should use
QNetworkConfigurationManager from the main thread first to preload the
plugins.
Task-number: QTBUG-18795
Task-number: QTBUG-18799
Reviewed-by: Cristiano Di Flora
Shane Kearns [Thu, 5 May 2011 15:03:14 +0000 (16:03 +0100)]
Update QTBUG-17223 for Qt 4.8
In Qt 4.7, http network requests are assigned to http connection
channels before connecting the channel.
In Qt 4.8, channels are connected "blind" as this gives a performance
improvement in certain circumstances.
On the assumption that User-Agent should be the same for all the
requests being sent to the server in a given burst, we use the first
queued request to set the user agent for a http proxy.
Task-number: QTBUG-17223
Reviewed-by: Markus Goetz
Reviewed-by: Martin Petersson
Shane Kearns [Thu, 5 May 2011 14:31:49 +0000 (15:31 +0100)]
fix tst_qnetworkreply::httpProxyCommands autotest
Due to architecture changes in Qt 4.8, clearing the proxy before the
request is complete causes the http connection to not use any proxy.
The issue is that the proxy isn't resolved until after the bearer has
been started (which is correct in the general case, as system proxy
is unknown until that time).
Also increased the test's timeout from 1 second to 15, as starting a
bearer can be slow.
Reviewed-by: Markus Goetz
Shane Kearns [Wed, 4 May 2011 16:27:36 +0000 (17:27 +0100)]
Send User-Agent from the network request in http proxy CONNECT command
Some proxies can discriminate based on the User-Agent when sent a
CONNECT command for establishing a HTTPS connection.
With this change, if the User-Agent header is set in the QNetworkRequest
then it will be passed to the http socket engine for use in the connect
command sent to the proxy.
As before, "Mozilla/5.0" will be used by default when no user agent
has been set.
Task-number: QTBUG-17223
Reviewed-by: Markus Goetz
Shane Kearns [Mon, 18 Apr 2011 14:46:19 +0000 (15:46 +0100)]
Add autotests for configuration dependent network proxies
1. test that systemProxyForQuery returns something for all configs
2. test that QNetworkAccessManager uses the settings for the
configuration it was started with.
Task-number: QTBUG-18618
Reviewed-by: Peter Hartmann
Shane Kearns [Mon, 18 Apr 2011 14:30:39 +0000 (15:30 +0100)]
Fix QNetworkReplyImpl error handling
The backend was never started when compiled without bearer management,
now it is.
Now emits the error signal in case of startup errors which would leave
the state machine hanging. Previously it just printed a warning.
Reviewed-by: Peter Hartmann
Shane Kearns [Mon, 18 Apr 2011 14:23:33 +0000 (15:23 +0100)]
Enable per network configuration proxy settings in QNetworkAccessManager
Delayed the resolving of the proxy until the backend is being started.
This is because the proxy settings are not known until after
QNetworkAccessManager has brought the network online using
QNetworkSession.
On Nokia's symbian3 phones, the default network configuration is a
service network containing a list of access points in priority order.
For a typical user, this will include one or more WLAN networks and a
cellular network - each of which can have different proxy settings.
Task-number: QTBUG-18618
Reviewed-by: Peter Hartmann
Shane Kearns [Fri, 15 Apr 2011 13:09:43 +0000 (14:09 +0100)]
Allow a network configuration to be included in a proxy query
When Qt is compiled with bearer management support, the network
configuration can be included as a parameter in QNetworkProxyQuery.
This allows QNetworkProxyFactory::systemProxyForQuery to get the right
proxy setting for a specific network. For example a mobile phone could
have network configurations for home WLAN, work WLAN and 3G data
access points, each with different proxy configurations.
Task-number: QTBUG-18618
Reviewed-by: Peter Hartmann
Shane Kearns [Tue, 12 Apr 2011 17:06:17 +0000 (18:06 +0100)]
Fix error handling in write for socks socket engine
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
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