qt:bada-lighthouse.git
8 years agoBegin BADA port 4.7
BogDan Vatra [Sat, 19 Jun 2010 18:07:00 +0000 (21:07 +0300)]
Begin BADA port

8 years agoMerge remote branch 'qt/4.7' into lighthouse
Paul Olav Tvete [Fri, 18 Jun 2010 11:10:26 +0000 (13:10 +0200)]
Merge remote branch 'qt/4.7' into lighthouse

Conflicts:
configure
mkspecs/common/qws.conf
src/corelib/io/qresource.cpp
src/gui/image/qpixmapdata_p.h
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication_p.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontdatabase.cpp
src/opengl/qgl_p.h
src/plugins/mediaservices/gstreamer/gstreamer.pro

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
Qt Continuous Integration System [Thu, 17 Jun 2010 17:06:07 +0000 (19:06 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
  Updated WebKit to 6623b5da196390748dc619461739f9cb84524736

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Thu, 17 Jun 2010 13:32:40 +0000 (15:32 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  doc: Added more DITA output to the XML generator
  Usefully convert from QtScript object/array to QVariant
  document QSslSocket::systemCaCertificates() change in changelog
  Implement QIODevice::peek() using read() + ungetBlock().
  Allocate the memory for QtFontSize when count > 1
  doc: Added more DITA output to the XML generator
  Defer allocation of GIF decoding tables/stack.
  Make sure only started gestures can cause cancellations
  Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-16062010 ( 8b2d3443afca194f8ac50a63151dc9d19a150582 )
  qmake: Fix CONFIG += exceptions_off with the MSVC project generator.
  Fix some kind of race condition while using remote commands.
  Work around ICE in Intel C++ Compiler 11.1.072
  Reduce the memory consumption of QtFontStyle

8 years agoMerge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Martin Smith [Thu, 17 Jun 2010 13:13:26 +0000 (15:13 +0200)]
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7

8 years agodoc: Added more DITA output to the XML generator
Martin Smith [Thu, 17 Jun 2010 13:12:23 +0000 (15:12 +0200)]
doc: Added more DITA output to the XML generator

More cxxFunction stuff for member functions.

Task-number:    QTBUG-11391

8 years agoUsefully convert from QtScript object/array to QVariant
Kent Hansen [Thu, 17 Jun 2010 10:27:43 +0000 (12:27 +0200)]
Usefully convert from QtScript object/array to QVariant

For arrays, the conversion would crash if the array was cyclic.
Introduce a set that keeps track of which objects are being
converted, and return an empty list when a cycle is detected.

For other types of objects, the object was previously attempted
to be converted to a primitive, which typically meant you would
get the string representation ("[object Object]"), since most
(practically all) objects can be converted to a string -- not
useful at all.

Change the conversion so it converts the object to a QVariantMap
instead. This was already done for slots that took a QVariantMap
as argument, but only one level deep. Make the conversion recursive,
using the same mechanism as for arrays to detect cycles.

This change also means that you get a meaningful
JS object => QVariant => JS object roundtrip.
It also aligns the behavior with the Qt WebKit bridge.

Update the documentation to describe the new behavior.
The 4.7 changelog will also be updated under "important behavioral
changes".

This change exposed an issue with one of the QML autotests: A JS
object was assigned to a QVariant property, which caused it to be
converted to a string (rather than a QVariantMap) -- just shows
that the previous behavior was unintuitive). Later, this variant
property is compared to another object, the intention being to
compare the _properties_ of the two objects; but because the variant
property contained a string, this would cause the other operand
(object) to be converted to a string as well ("[object Object]"),
causing a meaningless test pass.

Change the test to deserialize both objects using JSON.stringify,
and compare the resulting strings, so that actual
JS object => QVariant(Map) => JS object roundtrip is tested (the
intention).

Task-number: QTBUG-3511
Reviewed-by: Olivier Goffart
8 years agoTslib mouse input for Lighthouse
Paul Olav Tvete [Thu, 17 Jun 2010 12:16:06 +0000 (14:16 +0200)]
Tslib mouse input for Lighthouse

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 17 Jun 2010 10:44:19 +0000 (12:44 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Provide 'make unsigned_sis' target for Symbian mkspecs

8 years agoUpdated WebKit to 6623b5da196390748dc619461739f9cb84524736
Simon Hausmann [Thu, 17 Jun 2010 10:26:02 +0000 (12:26 +0200)]
Updated WebKit to 6623b5da196390748dc619461739f9cb84524736

Integrated changes:

|| <https://webkit.org/b/38401> || Make repaint throttling parameters configurable runtime. ||
|| <https://webkit.org/b/40073> || [Qt] rendering error in mediawiki ||
|| <https://webkit.org/b/36463> || Spatial Navigation: make it work with focusable elements in overflow content ||
|| <https://webkit.org/b/39857> || GIFs loop one time too few ||
|| <https://webkit.org/b/36818> || [Qt] Animated GIF images does not animate 10x as expected by default. ||
|| <https://webkit.org/b/37844> || [Qt] Image::drawTiled animations does not work ||
|| <https://webkit.org/b/40567> || [Qt] QtWebKit crashes while initializing flash plugin 10.1.53.64... ||
|| <https://webkit.org/b/39439> || Spatial Navigation: using offset{Left,Top} is not enough to get the proper inner frames position ||
|| <https://webkit.org/b/39195> || Spatial Navigation: refactor scrollInDirection to work with scrollable content ||

8 years agoAdding support for setParent api in plugins
Jørgen Lind [Thu, 17 Jun 2010 08:23:57 +0000 (10:23 +0200)]
Adding support for setParent api in plugins

This is work in progress, but boxes and wolfenqt works in
testlite:)

8 years agodocument QSslSocket::systemCaCertificates() change in changelog
Peter Hartmann [Thu, 17 Jun 2010 07:55:45 +0000 (09:55 +0200)]
document QSslSocket::systemCaCertificates() change in changelog

Reviewed-by: Zeno Albisser
8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 17 Jun 2010 05:00:54 +0000 (07:00 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  doc: add note that items with width or height of 0 are not positioned.
  Add test for model data changes.
  clearFocus() shouldn't mess with focus if it doesn't have focus
  Fix the N900 device orientation backend
  Micro cleanup
  Write TextInput.positionToRectangle docs.
  Minor demo fixes
  Fix autoScroll implementation
  Move knowledge of QGraphicsObject out of qml engine
  Stopping a flick resulted in the next click being consumed.
  Enhance docs
  Slight addition to the docs.

8 years agodoc: add note that items with width or height of 0 are not positioned.
Martin Jones [Thu, 17 Jun 2010 03:57:15 +0000 (13:57 +1000)]
doc: add note that items with width or height of 0 are not positioned.

8 years agoAdd test for model data changes.
Martin Jones [Thu, 17 Jun 2010 03:51:26 +0000 (13:51 +1000)]
Add test for model data changes.

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Thu, 17 Jun 2010 02:03:53 +0000 (04:03 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fix crash on Mac OS X when drawing text with Qt::TextBypassShaping set
  Fixed infinite recursion when drawing very large painter paths.
  Fixed full-rule on clipped painter paths.
  Removed unnecessary lines of code.
  Fixed problem with wrong size hints when items were removed.

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Martin Jones [Thu, 17 Jun 2010 00:29:02 +0000 (10:29 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

8 years agoclearFocus() shouldn't mess with focus if it doesn't have focus
Martin Jones [Thu, 17 Jun 2010 00:26:13 +0000 (10:26 +1000)]
clearFocus() shouldn't mess with focus if it doesn't have focus
removing an item from the view caused the focus to change even if
the removed item didn't have focus.

Task-number: QTBUG-11341
Reviewed-by: Yoann Lopes
8 years agoImplement QIODevice::peek() using read() + ungetBlock().
Andreas Kling [Wed, 16 Jun 2010 22:17:32 +0000 (00:17 +0200)]
Implement QIODevice::peek() using read() + ungetBlock().

The previous implementation was doing ungetChar() in a loop.

Task-number: QTBUG-9654
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: mread
8 years agoAllocate the memory for QtFontSize when count > 1
Benjamin Poulain [Wed, 16 Jun 2010 23:17:55 +0000 (01:17 +0200)]
Allocate the memory for QtFontSize when count > 1

This fix a regression introduced by
71ba2b0973d291e991e1498c266e69d6640c8531.
In the case count >= 1 && count < 8, no memory is allocated.

Reviewed-by: Andreas Kling
8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Wed, 16 Jun 2010 22:58:16 +0000 (00:58 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  doc: Added more DITA output to the XML generator
  Defer allocation of GIF decoding tables/stack.
  Make sure only started gestures can cause cancellations
  Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-16062010 ( 8b2d3443afca194f8ac50a63151dc9d19a150582 )
  qmake: Fix CONFIG += exceptions_off with the MSVC project generator.
  Fix some kind of race condition while using remote commands.
  Work around ICE in Intel C++ Compiler 11.1.072
  Reduce the memory consumption of QtFontStyle

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 16 Jun 2010 20:06:33 +0000 (22:06 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Provide 'make unsigned_sis' target for Symbian mkspecs

8 years agoMerge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4...
Qt Continuous Integration System [Wed, 16 Jun 2010 16:50:34 +0000 (18:50 +0200)]
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration

* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (26 commits)
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 7932e8da6bfdeff653c572c22aed879c8c308829 )
  Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5e9b2a88688f6e360d7db00bc86a45bf2cf86e52
  VideoWidget example
  Buildfix for MSVC2008 (C90 violation)
  Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 1313dc84678c74f1c24f910f702d7ed27a417607
  Add skeleton changes files for 4.6.4.
  Bump version number after 4.6.3 release.
  Fixed unit test failure in qimagereader.
  beautify tst_QLocalSocket::writeToClientAndDisconnect
  QLocalSocket/Win: check for broken pipe in waitForReadyRead
  QLocalSocket/Win: call close on async connection loss
  Fix issues with thai line breaking
  fix detection of header files
  Prospective S60 build fix
  Thread safety for QFontEngineS60
  Allow to build Qt in static with mingw
  Fix incorrect line breaking in QtWebKit.
  QLocalSocket: don't emit readChannelFinished() twice on Windows
  QLocalSocket/Win: QLocalSocketPrivate::bytesAvailable renamed
  QLocalSocket: fix reading from a socket after broken connection
  ...

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Wed, 16 Jun 2010 16:21:24 +0000 (18:21 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Fix the N900 device orientation backend
  Micro cleanup
  Write TextInput.positionToRectangle docs.
  Minor demo fixes
  Fix autoScroll implementation
  Move knowledge of QGraphicsObject out of qml engine
  Stopping a flick resulted in the next click being consumed.
  Enhance docs
  Slight addition to the docs.

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6
Simon Hausmann [Wed, 16 Jun 2010 15:26:22 +0000 (17:26 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6

Conflicts:
src/3rdparty/harfbuzz/src/harfbuzz-shaper.h
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
src/corelib/global/qglobal.h
src/plugins/qpluginbase.pri
src/qbase.pri
tests/auto/selftests/expected_cmptest.txt
tests/auto/selftests/expected_crashes_3.txt
tests/auto/selftests/expected_longstring.txt
tests/auto/selftests/expected_maxwarnings.txt
tests/auto/selftests/expected_skip.txt
tools/assistant/tools/assistant/doc/assistant.qdocconf
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6
Simon Hausmann [Wed, 16 Jun 2010 15:23:34 +0000 (17:23 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6

8 years agoProvide 'make unsigned_sis' target for Symbian mkspecs
Miikka Heikkinen [Wed, 16 Jun 2010 12:54:18 +0000 (15:54 +0300)]
Provide 'make unsigned_sis' target for Symbian mkspecs

Rationale for this is that currently there is no simple way to create
a sis package that can be properly signed via Symbian open signed
mechanism, as 'make sis' will by default use self-signed certificates
and automatically patch capabilities of binaries to remove
non-self-signable ones.

Task-number: QTBUG-11455
Reviewed-by: Janne Koskinen
8 years agoupdate QDesktopWidget geometry when screens are added, removed, or resized
Jeremy Katz [Wed, 16 Jun 2010 13:34:25 +0000 (15:34 +0200)]
update QDesktopWidget geometry when screens are added, removed, or resized

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integr...
Qt Continuous Integration System [Wed, 16 Jun 2010 13:22:26 +0000 (15:22 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Attribute change to allow inclusion of image files.

8 years agoFix the N900 device orientation backend
Harald Fernengel [Wed, 16 Jun 2010 13:17:33 +0000 (15:17 +0200)]
Fix the N900 device orientation backend

Use D-Bus calls instead of polling

Reviewed-by: Alan Alpert
8 years agoMicro cleanup
Harald Fernengel [Wed, 16 Jun 2010 13:16:16 +0000 (15:16 +0200)]
Micro cleanup

Use Qt::WA_DeleteOnClose to clean up the top-level window

Reviewed-by: Alan Alpert
8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Wed, 16 Jun 2010 12:51:39 +0000 (14:51 +0200)]
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:
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 7932e8da6bfdeff653c572c22aed879c8c308829 )
  Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5e9b2a88688f6e360d7db00bc86a45bf2cf86e52
  Buildfix for MSVC2008 (C90 violation)
  Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 1313dc84678c74f1c24f910f702d7ed27a417607

8 years agoMerge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Martin Smith [Wed, 16 Jun 2010 12:49:45 +0000 (14:49 +0200)]
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7

8 years agodoc: Added more DITA output to the XML generator
Martin Smith [Wed, 16 Jun 2010 12:49:07 +0000 (14:49 +0200)]
doc: Added more DITA output to the XML generator

Some of the cxxFunction stuff for member functions.

Task-number:    QTBUG-11391

8 years agoDisable Qt3Support for Lighthouse
Paul Olav Tvete [Wed, 16 Jun 2010 12:45:40 +0000 (14:45 +0200)]
Disable Qt3Support for Lighthouse

This turns it off hard, ignoring configure options to the contrary.

Reviewed-by: Jørgen
8 years agoDefer allocation of GIF decoding tables/stack.
Andreas Kling [Wed, 16 Jun 2010 03:00:47 +0000 (05:00 +0200)]
Defer allocation of GIF decoding tables/stack.

WebKit creates many image readers but will only retrieve the dimensions
until the image itself is actually needed (i.e appears in the viewport.)

This avoids allocating 16kB per GIF image until it's time to actually
decode it.

Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
8 years agoMake sure only started gestures can cause cancellations
Thomas Zander [Wed, 16 Jun 2010 11:54:56 +0000 (13:54 +0200)]
Make sure only started gestures can cause cancellations

The design is that calling setGestureCancelPolicy on the gesture
that is in starting state, and is accepted can cause other gestures
to be cancelled.
So change the logic to follow this, which means we won't try to execute
the cancel strategy if the gesture was never accepted and avoid the
crash detailed in the task.

Reviewed-by: Denis
Task-number: QTBUG-9771

8 years agoUpdated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javasc...
Kent Hansen [Wed, 16 Jun 2010 12:14:06 +0000 (14:14 +0200)]
Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-16062010 ( 8b2d3443afca194f8ac50a63151dc9d19a150582 )

Integrated changes:

|| <https://webkit.org/b/37195> || JSC's currentThreadStackBase is not reentrant on some platforms

8 years agoFix crash on Mac OS X when drawing text with Qt::TextBypassShaping set
Tor Arne Vestbø [Wed, 16 Jun 2010 11:41:46 +0000 (13:41 +0200)]
Fix crash on Mac OS X when drawing text with Qt::TextBypassShaping set

On Mac we end up in a code path where logClusters is 0, and the fallback
path for when CoreText fails to shape text didn't take this into account.

Reviewed-by: Simon Hausmann
8 years agoqmake: Fix CONFIG += exceptions_off with the MSVC project generator.
Jocelyn Turcotte [Tue, 15 Jun 2010 12:44:17 +0000 (14:44 +0200)]
qmake: Fix CONFIG += exceptions_off with the MSVC project generator.

cl.exe default exception handling (when not specified on the command
line) is to disable exceptions. In vcproj files however, if the
ExceptionHandling option is not specified, the default behavior is to
enable exceptions without SEH (/EHsh).

This patch makes sure that ExceptionHandling is disabled when /EHsc is
not fed to parseOption (which happens when the exceptions_off config
is encountered).

For VS2003 the values are a bit different where "false"==ehNone,
"true"==ehNoSEH and ehSEH is not available. The default is "true"
if not specified thus why we set it to "false" when exceptions_off
is given.

Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
8 years agoSet the desktop widget geometry to reflect the size of the screen(s)
Jeremy Katz [Wed, 16 Jun 2010 10:47:23 +0000 (12:47 +0200)]
Set the desktop widget geometry to reflect the size of the screen(s)

Also removed a stray debug message

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Alan Alpert [Wed, 16 Jun 2010 10:32:05 +0000 (12:32 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

8 years agoFix some kind of race condition while using remote commands.
kh1 [Wed, 16 Jun 2010 10:24:12 +0000 (12:24 +0200)]
Fix some kind of race condition while using remote commands.

Please do not merge to master, we had to fix it different there.

Because of async content loading, we have to cache the url to load. A
combination of SetSource and SyncContents would have lead to sync to the
old url till loading was finished. So return the cached during loading.

Task-number: QTBUG-11342
Reviewed-by: ck
8 years agoWrite TextInput.positionToRectangle docs.
Alan Alpert [Wed, 16 Jun 2010 10:27:53 +0000 (12:27 +0200)]
Write TextInput.positionToRectangle docs.

Also renamed the argument to be more accurate.

Task-number: QTBUG-11168

8 years agoFixed infinite recursion when drawing very large painter paths.
Kim Motoyoshi Kalland [Wed, 16 Jun 2010 10:10:03 +0000 (12:10 +0200)]
Fixed infinite recursion when drawing very large painter paths.

Task-number: QTBUG-11291
Reviewed-by: Gunnar
8 years agoFixed full-rule on clipped painter paths.
Kim Motoyoshi Kalland [Wed, 16 Jun 2010 10:03:02 +0000 (12:03 +0200)]
Fixed full-rule on clipped painter paths.

The fill-rule of the original path was not copied into the
clipped path.

Reviewed-by: Gunnar
8 years agoRemoved unnecessary lines of code.
Kim Motoyoshi Kalland [Wed, 16 Jun 2010 09:59:34 +0000 (11:59 +0200)]
Removed unnecessary lines of code.

Reviewed-by: Gunnar
8 years agoMinor demo fixes
Alan Alpert [Wed, 16 Jun 2010 10:20:41 +0000 (12:20 +0200)]
Minor demo fixes

Found some minor demo issues while testing a TextInput change.

8 years agoFix autoScroll implementation
Alan Alpert [Wed, 16 Jun 2010 10:18:40 +0000 (12:18 +0200)]
Fix autoScroll implementation

The scrolling should not be calculated inside the paint event, this
leads to some incorrect behaviour. It is now calculated separately when
needed.

Patch actually written by Alexis, and I reviewed it.

Task-number: QTBUG-11127
Reviewed-by: Alexis Ménard
8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Wed, 16 Jun 2010 10:13:42 +0000 (12:13 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fixed problem with wrong size hints when items were removed.

8 years agoWork around ICE in Intel C++ Compiler 11.1.072
Thiago Macieira [Sat, 29 May 2010 18:34:46 +0000 (20:34 +0200)]
Work around ICE in Intel C++ Compiler 11.1.072

qml/qdeclarativecompiledbindings.cpp(1141) (col. 11): internal error: 0_1855

Intel reports that this bug has been fixed with release 12 of ICC

Reviewed-By: Alan Alpert
8 years agoReduce the memory consumption of QtFontStyle
Benjamin Poulain [Wed, 16 Jun 2010 08:01:42 +0000 (10:01 +0200)]
Reduce the memory consumption of QtFontStyle

QtFontSize::pixelSize() was allocating 8 slots for QtFontSize
while most fonts only require one.
This patch add a special case for the first QtFontSize in order to
reduce memory consumption.

The size of QtFontSize in memory has also been reduced.

Overall, the memory consumtion of QtFontStyle instances go down
from 100kb to 10kb.

Reviewed-by: Eskil Abrahamsen Blomfeldt
8 years agoFixed problem with wrong size hints when items were removed.
Jan-Arve Sæther [Wed, 16 Jun 2010 08:05:44 +0000 (10:05 +0200)]
Fixed problem with wrong size hints when items were removed.

The reason was that the row/column count was not updated after an item
was removed. (Note that qgraphicslinearlayout already did this, so we
just follow the same pattern, except that the code for
QGraphicsGridLayout is a bit more complex...

Task-number: QTBUG-10314
Reviewed-by: Alexis Menard
8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Wed, 16 Jun 2010 08:32:06 +0000 (10:32 +0200)]
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:
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 7932e8da6bfdeff653c572c22aed879c8c308829 )
  Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5e9b2a88688f6e360d7db00bc86a45bf2cf86e52
  Buildfix for MSVC2008 (C90 violation)
  Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 1313dc84678c74f1c24f910f702d7ed27a417607

8 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 7932e8...
Simon Hausmann [Wed, 16 Jun 2010 08:22:47 +0000 (10:22 +0200)]
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 7932e8da6bfdeff653c572c22aed879c8c308829 )

Changes in WebKit/qt since the last update:

* https://bugs.webkit.org/show_bug.cgi?id=39857 -- GIFs loop one time too few

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6
Simon Hausmann [Wed, 16 Jun 2010 08:17:02 +0000 (10:17 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6

Conflicts:
src/plugins/imageformats/gif/qgifhandler.cpp

8 years agoUpdated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5e9b2a88688f6e360...
Simon Hausmann [Wed, 16 Jun 2010 07:57:24 +0000 (09:57 +0200)]
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5e9b2a88688f6e360d7db00bc86a45bf2cf86e52

Includes Andreas' MSVC fix and fixes the RVCT build by temporarily
disabling the structure packing.

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Aaron Kennedy [Wed, 16 Jun 2010 07:36:10 +0000 (17:36 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

8 years agoMove knowledge of QGraphicsObject out of qml engine
Aaron Kennedy [Wed, 16 Jun 2010 07:25:13 +0000 (17:25 +1000)]
Move knowledge of QGraphicsObject out of qml engine

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Wed, 16 Jun 2010 07:16:17 +0000 (09:16 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (62 commits)
  Use native locale aware string comparison on Symbian.
  Temporary fix for regression in QSslCertificate::fromPath()
  doc: Added more DITA output to the XML generator
  Fix symbian building of TARGET with a slash
  Fix a minor typo in QAbstractItemModel's documentation.
  QXmlSchema: allow usage of xsd:all
  QSslSocket: fix build for MinGW and VS 2005
  Fix symbian-abld build failure with bearer plugins
  remove certificate bundle
  make QSslSocket::systemCaCertificates() use system certs
  Adjusted RegExp in QSslCertificate::fromPath()
  Fix QSystemTrayIcon::supportsMessages() on Windows
  Use NIM_SETVERSION to get the latest behavior
  Cleanup obsolete stuff
  doc: Added DITA XML generator
  Fixed a broken merge.
  Changed the way we detect touch screen on Windows.
  Fixed error deploying qsymbianbearer.qtplugin on Symbian.
  Revert "Attempt to fix build failure on Symbian."
  Attempt to fix build failure on Symbian.
  ...

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Martin Jones [Wed, 16 Jun 2010 06:34:50 +0000 (16:34 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

8 years agoStopping a flick resulted in the next click being consumed.
Martin Jones [Wed, 16 Jun 2010 06:33:19 +0000 (16:33 +1000)]
Stopping a flick resulted in the next click being consumed.

Task-number: QTBUG-11390

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integr...
Qt Continuous Integration System [Wed, 16 Jun 2010 06:29:51 +0000 (08:29 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  VideoWidget example

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integr...
Qt Continuous Integration System [Wed, 16 Jun 2010 05:12:48 +0000 (07:12 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  VideoWidget example

8 years agoVideoWidget example
Kurt Korbatits [Wed, 16 Jun 2010 05:08:43 +0000 (15:08 +1000)]
VideoWidget example
Added file filters to videowidget and videographicsitem examples
to only allow supported file formats to be opened.

Task-number:QTBUG-702
Reviewed-by:Andrew den Exter

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Wed, 16 Jun 2010 04:15:43 +0000 (06:15 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Clean up list examples
  Document QML_IMPORT_TRACE
  Document section.delegate
  Remove duplicated code.
  Fix bug with childrenRect resizing on startup.

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integr...
Qt Continuous Integration System [Wed, 16 Jun 2010 03:55:56 +0000 (05:55 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Attribute change to allow inclusion of image files.

8 years agoAttribute change to allow inclusion of image files.
Toby Tomkins [Wed, 16 Jun 2010 02:56:45 +0000 (12:56 +1000)]
Attribute change to allow inclusion of image files.

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Wed, 16 Jun 2010 00:51:39 +0000 (02:51 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fixed QImageReader::format() inconsistency.
  Fixed missing stroke for flat ellipses.
  Doc: Documented qputenv and qgetenv
  Added missing sanity checks in qimage.cpp
  Fix regression, remove artificial emboldening of monospaced fonts
  Doc: Said to not access events after they are posted(postEvent).
  Doc: QTreeWidgetItems remove themselves from views when deleted.
  Doc: Removed a link to Qt3 support in QSlider

8 years agoClean up list examples
Bea Lam [Tue, 15 Jun 2010 05:55:58 +0000 (15:55 +1000)]
Clean up list examples

8 years agoDocument QML_IMPORT_TRACE
Bea Lam [Tue, 15 Jun 2010 04:46:37 +0000 (14:46 +1000)]
Document QML_IMPORT_TRACE

8 years agoDocument section.delegate
Bea Lam [Tue, 15 Jun 2010 00:57:28 +0000 (10:57 +1000)]
Document section.delegate

8 years agoBuildfix for MSVC2008 (C90 violation)
Andreas Kling [Tue, 15 Jun 2010 22:05:29 +0000 (00:05 +0200)]
Buildfix for MSVC2008 (C90 violation)

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Tue, 15 Jun 2010 21:59:03 +0000 (23:59 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (62 commits)
  Use native locale aware string comparison on Symbian.
  Temporary fix for regression in QSslCertificate::fromPath()
  doc: Added more DITA output to the XML generator
  Fix symbian building of TARGET with a slash
  Fix a minor typo in QAbstractItemModel's documentation.
  QXmlSchema: allow usage of xsd:all
  QSslSocket: fix build for MinGW and VS 2005
  Fix symbian-abld build failure with bearer plugins
  remove certificate bundle
  make QSslSocket::systemCaCertificates() use system certs
  Adjusted RegExp in QSslCertificate::fromPath()
  Fix QSystemTrayIcon::supportsMessages() on Windows
  Use NIM_SETVERSION to get the latest behavior
  Cleanup obsolete stuff
  doc: Added DITA XML generator
  Fixed a broken merge.
  Changed the way we detect touch screen on Windows.
  Fixed error deploying qsymbianbearer.qtplugin on Symbian.
  Revert "Attempt to fix build failure on Symbian."
  Attempt to fix build failure on Symbian.
  ...

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 15 Jun 2010 19:17:09 +0000 (21:17 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  ComboBox popuplist is not correctly layouted in fullscreen mode
  Stylus menu for Share (QT app) is different from native S60 apps
  Change $${EPOCROOT} to also have drive if EPOCROOT env variable has it
  Stylus menu for Share (QT app) is different from native S60 apps

8 years agoMerge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4...
Qt Continuous Integration System [Tue, 15 Jun 2010 15:34:53 +0000 (17:34 +0200)]
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration

* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
  Fixed unit test failure in qimagereader.
  beautify tst_QLocalSocket::writeToClientAndDisconnect
  QLocalSocket/Win: check for broken pipe in waitForReadyRead
  QLocalSocket/Win: call close on async connection loss
  fix detection of header files
  Prospective S60 build fix
  Thread safety for QFontEngineS60
  Allow to build Qt in static with mingw
  Fix incorrect line breaking in QtWebKit.
  QLocalSocket: don't emit readChannelFinished() twice on Windows
  QLocalSocket/Win: QLocalSocketPrivate::bytesAvailable renamed
  QLocalSocket: fix reading from a socket after broken connection
  QLocalServer: make many simultaneous connection attempts work on Windows
  tst_QLocalSocket::threadedConnection autotest stabilized
  tst_qlocalsocket: pro files of client / server examples fixed
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( d8a9d09376a47b92ea49f1a078c392cbfdbc0ed6 )
  Regression Qt4.4: QMovie does not render properly some mng files
  QMovie cpu usage up to 100%

8 years agoUpdated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 1313dc84678c74f1c...
Simon Hausmann [Tue, 15 Jun 2010 14:23:50 +0000 (16:23 +0200)]
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 1313dc84678c74f1c24f910f702d7ed27a417607

This includes Andreas' changes to reduce the memory usage by
packing and re-odering data structures as well as Lars' greek shaper.

8 years agoUse native locale aware string comparison on Symbian.
Denis Dzyubenko [Mon, 14 Jun 2010 08:12:07 +0000 (10:12 +0200)]
Use native locale aware string comparison on Symbian.

Fix to use the native CompareC function instead.

Task-number: QTBUG-11350
Reviewed-by: Miikka Heikkinen
8 years agoComboBox popuplist is not correctly layouted in fullscreen mode
Sami Merila [Tue, 15 Jun 2010 13:09:41 +0000 (16:09 +0300)]
ComboBox popuplist is not correctly layouted in fullscreen mode

This is part two of the fix for issue QTBUG-9913.

This corrects the left margin of the ComboBox menu to start from the
left screen border (for LetToRight UI Layout), instead of having small
margin.

Task-number: QTBUG-9913
Reviewed-by: Alessandro Portale
8 years agoTemporary fix for regression in QSslCertificate::fromPath()
Zeno Albisser [Tue, 15 Jun 2010 11:39:25 +0000 (13:39 +0200)]
Temporary fix for regression in QSslCertificate::fromPath()

The regression was introduced with 164f347aba7287407615223dc2219a016ebc8248.
As soon as possible we should probably rewrite the fromPath() function,
to have a proper solution.
Nevertheless this might be a bigger change and should not be done
so late in release cycle.

Reviewed-by: TrustMe
8 years agofix minimizing VNC and LinuxFB top levels
Jeremy Katz [Tue, 15 Jun 2010 13:00:42 +0000 (15:00 +0200)]
fix minimizing VNC and LinuxFB top levels

8 years agoMerge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Martin Smith [Tue, 15 Jun 2010 12:55:18 +0000 (14:55 +0200)]
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7

8 years agodoc: Added more DITA output to the XML generator
Martin Smith [Tue, 15 Jun 2010 12:54:37 +0000 (14:54 +0200)]
doc: Added more DITA output to the XML generator

Task-number:    QTBUG-11391

8 years agoStylus menu for Share (QT app) is different from native S60 apps
Sami Merila [Tue, 15 Jun 2010 12:34:01 +0000 (15:34 +0300)]
Stylus menu for Share (QT app) is different from native S60 apps

This is part two of the fix.

This fix makes the menu item to be layoutted always with space reserved
for checkbox indicator, even if the menu item is not having one
(just like native side). Also, the right and left "gap areas"
(between menu border and menu item highlight) match the native side
more closely now. There is still some difference if using QMenu
(instead of QComboBoxListView), since we can't just ignore margin
set from widget.

Also, the Sym^3 "separator lines" are now started from correct position.

Finally, the menu item height now matches the native side.

Task-number: QT-3295
Reviewed-by: Alessandro Portale
8 years agoFixed QImageReader::format() inconsistency.
Samuel Rødal [Tue, 15 Jun 2010 11:06:19 +0000 (13:06 +0200)]
Fixed QImageReader::format() inconsistency.

If state is set to ReadHeader before canRead() then setFormat("png")
never gets called. We should make sure that setFormat() gets set
whenever canRead() returns true.

Task-number: QTBUG-2263
Reviewed-by: Kent Hansen
8 years agoFixed missing stroke for flat ellipses.
Samuel Rødal [Tue, 15 Jun 2010 10:33:39 +0000 (12:33 +0200)]
Fixed missing stroke for flat ellipses.

The behavior should be the same as for arcs and rects.

Task-number: QTBUG-2743
Reviewed-by: Eskil
8 years agoMerge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Sami Merila [Tue, 15 Jun 2010 12:32:56 +0000 (15:32 +0300)]
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7

8 years agoMerge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Geir Vattekar [Tue, 15 Jun 2010 12:02:32 +0000 (14:02 +0200)]
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7

8 years ago Doc: Documented qputenv and qgetenv
Geir Vattekar [Tue, 15 Jun 2010 11:59:41 +0000 (13:59 +0200)]
Doc: Documented qputenv and qgetenv

    Task-number: QTBUG-4041
Reviewed-by: Morten Engvoldsen
8 years agofix repaint of resized widgets that span multiple screens
Jeremy Katz [Tue, 15 Jun 2010 11:49:41 +0000 (13:49 +0200)]
fix repaint of resized widgets that span multiple screens

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Tue, 15 Jun 2010 11:42:01 +0000 (13:42 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Remove duplicated code.
  Fix bug with childrenRect resizing on startup.

8 years agoLinuxFB compilation fix
Jeremy Katz [Tue, 15 Jun 2010 11:20:33 +0000 (13:20 +0200)]
LinuxFB compilation fix

8 years agovirtual desktop multiscreen support - VNC plugin
Jeremy Katz [Tue, 15 Jun 2010 11:09:50 +0000 (13:09 +0200)]
virtual desktop multiscreen support - VNC plugin

8 years agoChange $${EPOCROOT} to also have drive if EPOCROOT env variable has it
Miikka Heikkinen [Tue, 15 Jun 2010 10:49:26 +0000 (13:49 +0300)]
Change $${EPOCROOT} to also have drive if EPOCROOT env variable has it

Since sbsv2 toolchain supports having sources and SDK on different
drives, $${EPOCROOT} needs to contain drive letter to make it work.

Reviewed-by: Jason Barron
8 years agoMerge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Sami Merila [Tue, 15 Jun 2010 09:34:19 +0000 (12:34 +0300)]
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7

8 years agofixed software cursor rendering when the widget under the cursor is redrawn
Jeremy Katz [Tue, 15 Jun 2010 09:07:04 +0000 (11:07 +0200)]
fixed software cursor rendering when the widget under the cursor is redrawn

also check if the cursor exists before checking if it is dirty when
considering an early exit from QFbScreen::doRedraw()

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
Qt Continuous Integration System [Tue, 15 Jun 2010 08:56:04 +0000 (10:56 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
  Updated WebKit to 40c2d6907ef75288b4f15e7fad334b9138acdbbf

8 years agoAdded missing sanity checks in qimage.cpp
Samuel Rødal [Tue, 15 Jun 2010 08:45:23 +0000 (10:45 +0200)]
Added missing sanity checks in qimage.cpp

We should be consistent and do sanity checks whenever we allocate new
images.

Task-number: QTBUG-1985
Reviewed-by: Eskil
8 years agoFix symbian building of TARGET with a slash
Thomas Zander [Tue, 15 Jun 2010 08:42:42 +0000 (10:42 +0200)]
Fix symbian building of TARGET with a slash

In case there is a slash in the target (for example; ../foo) then we
don't want to add a faulty cxxflags to the compile line.

Reviewed-by: Axis
8 years agoFix regression, remove artificial emboldening of monospaced fonts
Eskil Abrahamsen Blomfeldt [Tue, 15 Jun 2010 08:14:18 +0000 (10:14 +0200)]
Fix regression, remove artificial emboldening of monospaced fonts

In change 889e13652e00ba64060e7b62ed3377ea04d44faa we employed usage
of artificial emboldening of fonts with FreeType when a bold variant
of the font does not exist. This introduced a regression for monospaced
fonts, where the contract says that all glyphs must be the same width.
Since the artificial emboldening algorithm does not support this
contract, it has been turned off for monospaced fonts, reverting to
the old behavior for this particular class of fonts.

Task-number: QTBUG-11353
Reviewed-by: Paul