qt:ritts_qt.git
7 years agoMerge remote branch 'mainline/4.8' into staging
Jiang Jiang [Fri, 8 Jul 2011 07:57:45 +0000 (09:57 +0200)]
Merge remote branch 'mainline/4.8' into staging

Conflicts:
dist/changes-4.8.0

7 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Thu, 7 Jul 2011 23:17:05 +0000 (09:17 +1000)]
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  Update the Window title when closing the last tab.
  On symbian QMessageBox does not look like native dialog
  Fix bidi reordering when part of text is rendered by fallback font

7 years agoMerge branch 4.7 into qt-4.8-from-4.7
Qt Continuous Integration System [Thu, 7 Jul 2011 16:06:16 +0000 (02:06 +1000)]
Merge branch 4.7 into qt-4.8-from-4.7

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Thu, 7 Jul 2011 11:37:35 +0000 (21:37 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
  Fix QProcess emitting two started signals on X11

7 years agoFix QProcess emitting two started signals on X11
Christian Strømme [Fri, 3 Jun 2011 15:55:09 +0000 (17:55 +0200)]
Fix QProcess emitting two started signals on X11

On X11 QProcess would emit two started signals when calling
QProcess::waitForStarted(). We should expect that the private
implementation of waitForStarted() should emit the started signal
and return true or false appropriately.

Task-number: QTBUG-7039
Change-Id: I3d381399ab7a39bf57db03a110fa6747a4fc6a24
Reviewed-on: http://codereview.qt.nokia.com/331
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
(cherry picked from commit 883b120d2f39c532cdd1a98d962af83be5adc4bd)

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Thu, 7 Jul 2011 09:12:49 +0000 (19:12 +1000)]
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:
  Update the Window title when closing the last tab.

7 years agoUpdate the Window title when closing the last tab.
Casper van Donderen [Thu, 7 Jul 2011 09:01:28 +0000 (11:01 +0200)]
Update the Window title when closing the last tab.

Fixes: QTBUG-20243

Reviewed-By: Kevin Wright
7 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Thu, 7 Jul 2011 05:54:09 +0000 (15:54 +1000)]
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  HTTP internals: continue gzip decompression if buffer fills exactly
  HTTP internals: do not discard data if not receiving gzip end marker
  Support partial input mode  - documentation update
  Add a null check for the backend in QNetworkReplyImpl.
  Support partial input mode
  Fixes switching runtime graphics system when the maximized window is shown or hidden.

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Wed, 6 Jul 2011 22:16:34 +0000 (08:16 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
  Add Q_DECL_CONSTEXPR
  Use Q_DECL_CONSTEXPR in QFlags
  Fix QScopedPointerarray default constructor

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Wed, 6 Jul 2011 18:38:00 +0000 (04:38 +1000)]
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 bidi reordering when part of text is rendered by fallback font

7 years agoAdd Q_DECL_CONSTEXPR
Olivier Goffart [Wed, 6 Jul 2011 14:35:04 +0000 (16:35 +0200)]
Add Q_DECL_CONSTEXPR

Defined to the c++0x constexpr when compiler supports it

Change-Id: I82687fe46848eedf3cffc39982106749b3dde8aa
Reviewed-on: http://codereview.qt.nokia.com/1247
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
(cherry picked from commit 28f927f8e092a02e233559f6da7fa96cf722c77d)

7 years agoUse Q_DECL_CONSTEXPR in QFlags
Olivier Goffart [Wed, 6 Jul 2011 14:37:14 +0000 (16:37 +0200)]
Use Q_DECL_CONSTEXPR in QFlags

Change-Id: I851e0b1c3f80a7b33a38cb1ab2665dc0f3c73adc
Reviewed-on: http://codereview.qt.nokia.com/1248
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
(cherry picked from commit c0c6dd2b022cfd667f32b8a48bcac86ac07d3880)

7 years agoMerge branch 4.7 into qt-4.8-from-4.7
Qt Continuous Integration System [Wed, 6 Jul 2011 16:05:48 +0000 (02:05 +1000)]
Merge branch 4.7 into qt-4.8-from-4.7

7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Wed, 6 Jul 2011 15:02:33 +0000 (01:02 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
  Fix S60 compile
  Remove some metrics parsing code from Core Text
  Fix compilation with c++0x mode
  Fix Windows compile
  Move styleName out of QtFontStyle::Key
  Fix regressions in previous QFontDatabase patch
  Don't issue GL calls when the geometry is empty
  Fixed missing painting with X11 paint engine.
  Add font related changes in 4.8 into changes
  Store styleName in font database

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 6 Jul 2011 14:37:54 +0000 (00:37 +1000)]
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:
  On symbian QMessageBox does not look like native dialog

7 years agoFix S60 compile
Jiang Jiang [Wed, 6 Jul 2011 13:24:06 +0000 (15:24 +0200)]
Fix S60 compile

7 years agoRemove some metrics parsing code from Core Text
Jiang Jiang [Wed, 6 Jul 2011 12:31:33 +0000 (14:31 +0200)]
Remove some metrics parsing code from Core Text

The respective value in some of the default fonts like Lucida Grande
are simply not reliable. It seems that the only reliable way to get
such information is by going through all the glyphs.

It seems that these code are not well tested on Mac and should be
removed for now since it caused visible regressions in QLineEdit
rendering.

Reviewed-by: Eskil
7 years agoFix compilation with c++0x mode
Lars Knoll [Wed, 6 Jul 2011 11:42:49 +0000 (13:42 +0200)]
Fix compilation with c++0x mode

Reviewed-by: Olivier
7 years agoFix Windows compile
Jiang Jiang [Wed, 6 Jul 2011 11:35:49 +0000 (13:35 +0200)]
Fix Windows compile

7 years agoOn symbian QMessageBox does not look like native dialog
Sami Merila [Wed, 6 Jul 2011 11:32:10 +0000 (14:32 +0300)]
On symbian QMessageBox does not look like native dialog

If API QMessageBox::setInformativeText() is used to set informative
text to the messagebox, the text is added to the "icon column",
which makes the messagebox look really weird.

Use layoutDirection() and add informative text to the same column
where other text elements are added.

Task-number: QTBUG-9924
Reviewed-by: Tomi Vihria
7 years agoMove styleName out of QtFontStyle::Key
Jiang Jiang [Wed, 6 Jul 2011 09:50:58 +0000 (11:50 +0200)]
Move styleName out of QtFontStyle::Key

Makes the code clearer and more explicit.

Reviewed-by: Eskil
7 years agoFix bidi reordering when part of text is rendered by fallback font
Eskil Abrahamsen Blomfeldt [Wed, 6 Jul 2011 09:44:57 +0000 (11:44 +0200)]
Fix bidi reordering when part of text is rendered by fallback font

If the fallback font is used for part of a RTL text, we need to
position the different text items accordingly, subtracting the advance
instead of adding it.

Task-number: QTBUG-17117
Done-with: Lars

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Tue, 5 Jul 2011 22:52:50 +0000 (08:52 +1000)]
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:
  HTTP internals: continue gzip decompression if buffer fills exactly
  HTTP internals: do not discard data if not receiving gzip end marker
  Add a null check for the backend in QNetworkReplyImpl.

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 5 Jul 2011 18:50:46 +0000 (04:50 +1000)]
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:
  Support partial input mode  - documentation update
  Support partial input mode

7 years agoFix QScopedPointerarray default constructor
Olivier Goffart [Tue, 5 Jul 2011 12:06:01 +0000 (14:06 +0200)]
Fix QScopedPointerarray default constructor

Since the compiler cannod find the template argument if there is no
argument passed to the constructor, this effectively means there is
no default constructor.

Add a default constructor

Task-number: QTBUG-20256
Change-Id: I310d5e1f3f94a8fe69fd3a5c46f2f51bca60facd
Reviewed-on: http://codereview.qt.nokia.com/1165
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
(cherry picked from commit d789e40c58c1ce8441d3bb4d6ca8d01fe02ad1a7)

7 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Tue, 5 Jul 2011 16:29:46 +0000 (02:29 +1000)]
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  QS60Style: QMessageBox theme background is incorrect
  Adding "hkscs_2004" to the codec alias table
  Adding Kazakh entry to the codec alias table
  On symbian QMessageBox icon is on different side than in native dialog

7 years agoMerge branch 4.7 into qt-4.8-from-4.7
Qt Continuous Integration System [Tue, 5 Jul 2011 16:06:20 +0000 (02:06 +1000)]
Merge branch 4.7 into qt-4.8-from-4.7

7 years agoHTTP internals: continue gzip decompression if buffer fills exactly
Peter Hartmann [Tue, 5 Jul 2011 15:32:54 +0000 (17:32 +0200)]
HTTP internals: continue gzip decompression if buffer fills exactly

Reviewed-by: Markus Goetz
Reviewed-by: Prasanth Ullattil
Task-number: QTBUG-12908

7 years agoHTTP internals: do not discard data if not receiving gzip end marker
Peter Hartmann [Tue, 5 Jul 2011 14:21:50 +0000 (16:21 +0200)]
HTTP internals: do not discard data if not receiving gzip end marker

some servers send gzip data without the gzip end markers. In that case,
we should deliver all content and tear down the gzip data structures.

Reviewed-by: Markus Goetz
Patch-by: Tor Arne Vestbø and Peter Hartmann
Task-number: QTBUG-16022

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Tue, 5 Jul 2011 14:37:20 +0000 (00:37 +1000)]
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:
  Fixes switching runtime graphics system when the maximized window is shown or hidden.

7 years agoSupport partial input mode - documentation update
Sami Merila [Tue, 5 Jul 2011 14:13:04 +0000 (17:13 +0300)]
Support partial input mode  - documentation update

Update the documentation related to the QApplication attribute.

Task-number: QTBUG-16572
Reviewed-by: Tomi Vihria
7 years agoAdd a null check for the backend in QNetworkReplyImpl.
Jocelyn Turcotte [Tue, 5 Jul 2011 13:53:57 +0000 (15:53 +0200)]
Add a null check for the backend in QNetworkReplyImpl.

This is a blurry attempt to fix a crash happening during bearer session loss/recovery.

Reviewed-by: Markus Goetz
7 years agoSupport partial input mode
Sami Merila [Tue, 5 Jul 2011 13:14:01 +0000 (16:14 +0300)]
Support partial input mode

Connect the internal private API to the QApplication public
attribute. This allows the enabling/disabling of the splitview
functionality from apps without any hacks.

Task-number: QTBUG-16572
Reviewed-by: Tomi Vihria
7 years agoFix regressions in previous QFontDatabase patch
Jiang Jiang [Tue, 5 Jul 2011 11:40:57 +0000 (13:40 +0200)]
Fix regressions in previous QFontDatabase patch

1. QtFontStyle::Key comparison should either use styleName or
   style, etc., but not both.
2. When initializing a QFont from QFontDatabase::font(), style
   and weight parameters should always be set even when we found
   a match styleName, in case these parameters will be used for
   comparison later.

Reviewed-by: Eskil
7 years agoFixes switching runtime graphics system when the maximized window is shown or hidden.
Stanislav Ionascu [Tue, 5 Jul 2011 10:48:11 +0000 (12:48 +0200)]
Fixes switching runtime graphics system when the maximized window is shown or hidden.

Merge-request: 1287
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 5 Jul 2011 10:20:12 +0000 (20:20 +1000)]
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:
  QS60Style: QMessageBox theme background is incorrect

7 years agoQS60Style: QMessageBox theme background is incorrect
Sami Merila [Tue, 5 Jul 2011 10:05:15 +0000 (13:05 +0300)]
QS60Style: QMessageBox theme background is incorrect

Use correct native theme graphic for dialog backgrounds. In the past,
native menu background graphic was used for dialogs and menus.

Task-number: QTBUG-9924
Reviewed-by: Tomi Vihria
7 years agoDon't issue GL calls when the geometry is empty
Eskil Abrahamsen Blomfeldt [Tue, 5 Jul 2011 08:33:59 +0000 (10:33 +0200)]
Don't issue GL calls when the geometry is empty

This works as a band-aid and optimization for QT-5104, because in the
text in the example, which contains latin text and has a latin default
font set, will think of all spaces between the cyrillic characters as
latin characters, hence it will make separate text items for them and
issue separate glDrawElements() calls. By cutting off if there are no
glyphs to draw, we can avoid hitting the actual bug for this and several
other use cases, making it less likely to happen.

Task-number: QT-5104
Reviewed-by: Samuel
7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
Qt Continuous Integration System [Tue, 5 Jul 2011 06:41:00 +0000 (16:41 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
  Flicking behaviour of ListView/GridView SnapOnItem is inconsistent
  Skip flick velocity test on Mac.
  Try again to fix flickable velocity on Mac.
  Try to fix Mac CI test failure
  qmlplugindump: Fix dumping with -path on Mac.
  qmlplugindump: Improve error message for misbehaving plugin components.
  Flickable is too sensitive.
  Reduce timing dependancy in flickable test
  Velocities reported by Flickable in onFlickStarted can be 0
  qmldump: Fix export comparison.
  QmlInspector: Some code cleanups
  QmlInspector: Some cleanup in the Color Picker tool
  QmlInspector: Unified mouse and keyboard event handling
  QmlInspector: Removed private header postfix and Qt namespace
  QmlInspector: Share code between QGV/SG based QML debugging
  qmlplugindump: For extended types, remove exports of the base object.
  qmlplugindump: Build debug version if possible.
  QDeclarativeDebug: Add code coverage information

7 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Tue, 5 Jul 2011 00:58:56 +0000 (10:58 +1000)]
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  Fix horizontal center alignment with trailing space
  Regression: QS60Style - All standardIcons are drawn as "small icons"
  QS60Style: provide more standard icons
  Update QtOpenGL section in Symbian platform notes.
  The qmlshadersplugin deployment must be scoped same as its building
  Do not try to open VKB if it is already open in Symbian
  Introduce QPixmap::fromSymbianRSgImage(RSgImage*) to GL engine

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review
Martin Jones [Tue, 5 Jul 2011 00:34:57 +0000 (10:34 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review

7 years agoMerge remote branch 'origin/4.7' into qt-4.8-from-4.7
Jani Hautakangas [Mon, 4 Jul 2011 21:11:09 +0000 (00:11 +0300)]
Merge remote branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
doc/src/external-resources.qdoc
src/gui/text/qtextlayout.cpp
src/opengl/qwindowsurface_gl.cpp

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Mon, 4 Jul 2011 18:55:11 +0000 (04:55 +1000)]
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:
  Adding "hkscs_2004" to the codec alias table
  Adding Kazakh entry to the codec alias table
  On symbian QMessageBox icon is on different side than in native dialog

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Mon, 4 Jul 2011 18:52:43 +0000 (04:52 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Update changelog with Accessibility fixes.
  Changelog: Add mention of qmlplugindump.

7 years agoAdding "hkscs_2004" to the codec alias table
Alessandro Portale [Mon, 4 Jul 2011 16:43:28 +0000 (18:43 +0200)]
Adding "hkscs_2004" to the codec alias table

Task-Number: QTBUG-19024
Reviewed-by: Olivier Goffart
7 years agoAdding Kazakh entry to the codec alias table
Alessandro Portale [Mon, 30 May 2011 17:16:20 +0000 (19:16 +0200)]
Adding Kazakh entry to the codec alias table

A Symbian update after "Anna" may come with Kazakh support.

Task-number: QTBUG-19024
Reviewed-by: Olivier Goffart
7 years agoFixed missing painting with X11 paint engine.
Samuel Rødal [Mon, 4 Jul 2011 13:41:16 +0000 (15:41 +0200)]
Fixed missing painting with X11 paint engine.

Re-introduce some "lost" code from 4.7.

Task-number: QTBUG-19639
Reviewed-by: Olivier Goffart
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Mon, 4 Jul 2011 14:35:58 +0000 (00:35 +1000)]
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 horizontal center alignment with trailing space

7 years agoAdd font related changes in 4.8 into changes
Jiang Jiang [Mon, 4 Jul 2011 13:27:13 +0000 (15:27 +0200)]
Add font related changes in 4.8 into changes

Reviewed-by: Eskil
7 years agoUpdate changelog with Accessibility fixes.
Frederik Gladhorn [Mon, 4 Jul 2011 14:01:36 +0000 (16:01 +0200)]
Update changelog with Accessibility fixes.

7 years agoStore styleName in font database
Jiang Jiang [Thu, 9 Jun 2011 13:58:09 +0000 (15:58 +0200)]
Store styleName in font database

So that queries like QFontDatabase::styles() can return exactly
the same styles as the system does. Then application can use
QFont::setStyleName() to select those styles later. With a lot
of fonts not providing correct numeric weight/width values and
even if they did, values are usually not directly mapped to
QFont enums, styleName is probably the only reliable way to
select any possible font in the system.

Task-number: QTBUG-13518
Change-Id: Id8a9469b804f1b5bb81d8c7378e7e8778f9a4fff
Reviewed-on: http://codereview.qt.nokia.com/739
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
7 years agoOn symbian QMessageBox icon is on different side than in native dialog
Sami Merila [Mon, 4 Jul 2011 12:50:14 +0000 (15:50 +0300)]
On symbian QMessageBox icon is on different side than in native dialog

In Symbian dialogs have layout (on LeftToRight UIs)
where icon is on the right and text on left.
Whereas, Qt by default has icon on the left and text on the right.

Fix Qt dialogs to behave like native ones on Symbian.

Task-number: QTBUG-9924
Reviewed-by: Tomi Vihria
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Mon, 4 Jul 2011 10:36:43 +0000 (20:36 +1000)]
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:
  Regression: QS60Style - All standardIcons are drawn as "small icons"

7 years agoFix horizontal center alignment with trailing space
Jiang Jiang [Mon, 4 Jul 2011 09:14:42 +0000 (11:14 +0200)]
Fix horizontal center alignment with trailing space

Text drawn with horizontal center alignment (AlignHCenter) and
QTextOption::IncludeTrailingSpaces flag as off should consider
the trailing space width (leading space width for RTL lines),
because textAdvance here ignores the space. Disregard that space
width here in alignLine will make RTL lines aligned a bit to
the right.

In short, for something like this:

|w1|space|text|w2|
|<- totalWidth ->|

we want to have w1 + spaceWidth = w2 = (totalWidth - textWidth)/2,
so that the actual rendered text will appear at the center of the
bounding rect.

Task-number: QTBUG-18303
Reviewed-by: Eskil
7 years agoRegression: QS60Style - All standardIcons are drawn as "small icons"
Sami Merila [Mon, 4 Jul 2011 10:03:02 +0000 (13:03 +0300)]
Regression: QS60Style - All standardIcons are drawn as "small icons"

StandardIcon enum comparison should be done with bitwise operation,
not with value.

Task-number: QTBUG-20240
Reviewed-by: Tomi Vihria
7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team
Qt Continuous Integration System [Mon, 4 Jul 2011 07:39:53 +0000 (17:39 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
  Flicking behaviour of ListView/GridView SnapOnItem is inconsistent
  Skip flick velocity test on Mac.
  Try again to fix flickable velocity on Mac.
  Try to fix Mac CI test failure
  qmlplugindump: Fix dumping with -path on Mac.
  qmlplugindump: Improve error message for misbehaving plugin components.
  Flickable is too sensitive.
  Reduce timing dependancy in flickable test
  Velocities reported by Flickable in onFlickStarted can be 0
  qmldump: Fix export comparison.

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Mon, 4 Jul 2011 06:53:58 +0000 (16:53 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
  Fixing winscw def file broken by recent merge
  runonphone: Change the upload option to allow uploading any file
  runonphone: Include the manufacturer name in the friendly name on OS X
  runonphone: Fix usb device enumeration on Mac OS X

7 years agoChangelog: Add mention of qmlplugindump.
Christian Kamm [Mon, 4 Jul 2011 06:15:29 +0000 (08:15 +0200)]
Changelog: Add mention of qmlplugindump.

7 years agoFlicking behaviour of ListView/GridView SnapOnItem is inconsistent
Martin Jones [Mon, 4 Jul 2011 00:08:15 +0000 (10:08 +1000)]
Flicking behaviour of ListView/GridView SnapOnItem is inconsistent

Improve the response of the views when SnapOneItem/Row is enabled.
In this case it is best to be much more reactive to the user input
since even a small movement in a particular direction indicates
a change to the next/previous item.

Change-Id: I6a8eb689c3b12cdc67f24106032e36bba82d2846
Task-number: QTBUG-19874
Reviewed-by: Bea Lam
7 years agoSkip flick velocity test on Mac.
Martin Jones [Sun, 3 Jul 2011 23:52:15 +0000 (09:52 +1000)]
Skip flick velocity test on Mac.

Change-Id: Ib995961d7b1a939e5feb86d72a82408d1ceebe88
Task-number: QTBUG-19676
Reviewed-by: Bea Lam
7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Sun, 3 Jul 2011 11:46:09 +0000 (21:46 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Doc: Fixing typo

7 years agoDoc: Fixing typo
Sergio Ahumada [Sat, 2 Jul 2011 10:59:09 +0000 (12:59 +0200)]
Doc: Fixing typo

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
Qt Continuous Integration System [Sat, 2 Jul 2011 07:41:59 +0000 (17:41 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: (41 commits)
  Make sure the declarative plugin of QtWebKit is build once.
  Make sure JavaScriptCore is build once.
  Updated WebKit to a52dbae362a295e0adfb7ee4fdc21734ae4b7b45
  2011-05-23 Matthew Delaney <mdelaney@apple.com>
  Fix headers generation for QtWebKit.
  2011-06-28 Alexis Menard <alexis.menard@openbossa.org>
  Skip QtWebKit as it leaks symbols and add a namespace exception for QtScript.
  Fix the auto-tests of QtWebKit.
  2011-06-27 Joe Wild <joseph.wild@nokia.com>
  2011-06-28 Alexis Menard <alexis.menard@openbossa.org>
  Updated WebKit to d30a30ac4faadcb8b2e282e343c921f919fbca9b
  Updated WebKit to 631751dee41f81af4daa7821f98b1ce8667c4d90
  Updated WebKit to 0de6fbe7d7714e4d2520f84a7d7e0c5ed9a55114
  Make QtWebKit actually works when linked to an application.
  Attempt to get Symbian building with SQLite.
  Make the headers test pass by including QtGui/QColor instead of QColor.
  Fix the in-tree build by not letting qtbase.pri add explicitlib or staticlib to CONFIG.
  Hack RenderBlock's continuation() and setContinuation() for RVCT 2.x.
  Use WTF::notFound instead of -1 to check for Vector::find() errors.
  The autotests don't even build on Symbian, skip them for now.
  ...

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Sat, 2 Jul 2011 04:15:02 +0000 (14:15 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  changelog
  Compile with DEBUG_FONTENGINE define
  minor optimization
  remove the old compatibility code
  make QFontEngineQPF1 work even without mmap(2) support
  Doc: Fixing typo

7 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Sat, 2 Jul 2011 00:30:27 +0000 (10:30 +1000)]
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  Re-apply licenseheader text in source files for qt4.7
  Fix QWidget::palettePropagation2() autotest on Symbian (part 2)
  Fix QWidget::palettePropagation2() autotest on Symbian
  QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5
  Fix text color in some cases of QML and QStaticText
  Added qmlshadersplugin to Symbian s60installs.pro-file.
  Fix KERN-EXEC 0 errors in symbian bearer plugin

7 years agoMerge branch 4.7 into qt-4.8-from-4.7
Qt Continuous Integration System [Fri, 1 Jul 2011 16:05:55 +0000 (02:05 +1000)]
Merge branch 4.7 into qt-4.8-from-4.7

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Fri, 1 Jul 2011 15:38:45 +0000 (01:38 +1000)]
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:
  QS60Style: provide more standard icons
  Update QtOpenGL section in Symbian platform notes.
  The qmlshadersplugin deployment must be scoped same as its building
  Do not try to open VKB if it is already open in Symbian
  Introduce QPixmap::fromSymbianRSgImage(RSgImage*) to GL engine

7 years agoQS60Style: provide more standard icons
Sami Merila [Fri, 1 Jul 2011 11:27:22 +0000 (14:27 +0300)]
QS60Style: provide more standard icons

Add custom standard icons for Symbian iconography. Additionally,
map few existing standard icon enums to new icons.

Task-number: QT-5116
Reviewed-by: Miikka Heikkinen
7 years agochangelog
Harald Fernengel [Fri, 1 Jul 2011 11:26:58 +0000 (13:26 +0200)]
changelog

7 years agoCompile with DEBUG_FONTENGINE define
Harald Fernengel [Fri, 1 Jul 2011 11:13:34 +0000 (13:13 +0200)]
Compile with DEBUG_FONTENGINE define

Trivial fix to make the debug code compile again after latest changes

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Fri, 1 Jul 2011 11:13:00 +0000 (21:13 +1000)]
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:
  Re-apply licenseheader text in source files for qt4.7

7 years agominor optimization
Ritt Konstantin [Fri, 1 Jul 2011 11:07:50 +0000 (13:07 +0200)]
minor optimization

use the cached data from fileinfo rather than re-creating it one line later

Merge-request: 1260
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
7 years agoremove the old compatibility code
Ritt Konstantin [Fri, 1 Jul 2011 11:07:49 +0000 (13:07 +0200)]
remove the old compatibility code

obsoleted by the last commit (and moreover, disabled a while ago)

Merge-request: 1260
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
7 years agomake QFontEngineQPF1 work even without mmap(2) support
Ritt Konstantin [Fri, 1 Jul 2011 11:07:48 +0000 (13:07 +0200)]
make QFontEngineQPF1 work even without mmap(2) support

this also fixes a memory leaking on Integrity
(an allocated data was unmap()'ed rather than free()'d)

Merge-request: 1260
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Fri, 1 Jul 2011 10:55:50 +0000 (20:55 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
  update 4.8.0 changes file
  Update 4.8.0 changes file
  Symbian socket engine: remove remaining todo comments
  Symbian: tune network autotest heap size so they can run on emulator
  Fix invalid read in QUrl::removeAllEncodedQueryItems
  Push the data together with the error in the synchronous case.

7 years agoupdate 4.8.0 changes file
aavit [Fri, 1 Jul 2011 10:51:09 +0000 (12:51 +0200)]
update 4.8.0 changes file

7 years agoMerge remote-tracking branch 'qt-mainline/4.8'
aavit [Fri, 1 Jul 2011 10:50:25 +0000 (12:50 +0200)]
Merge remote-tracking branch 'qt-mainline/4.8'

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integ...
Qt Continuous Integration System [Fri, 1 Jul 2011 10:49:16 +0000 (20:49 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  Cocoa: QFileDialog: fix filename filter not applied correctly
  Fix typo in docs: occurred.
  Cocoa: fix qtabwidget auto test failure
  Cocoa: fix qwidget auto test failures
  Cocoa: Fix qgraphicsproxywidget auto test
  Use Q_SLOTS instead of slots in public headers.
  Fix a11y crash: dock doesn't always have a widget.
  Fix typo in comment.
  Mac: respect WA_ShowWithoutActivating flag
  Remove misleading and incorrect information from dropMimeData docs.
  Provide the resetInternalData slot to cleanly reset data in proxy subclasses.
  Mac: switch raster off as default paint engine

7 years agoUpdate QtOpenGL section in Symbian platform notes.
Jani Hautakangas [Fri, 1 Jul 2011 10:10:43 +0000 (13:10 +0300)]
Update QtOpenGL section in Symbian platform notes.

Task-number: QTBUG-20216
Reviewed-by: Laszlo Agocs
7 years agoRe-apply licenseheader text in source files for qt4.7
Jyri Tahtela [Fri, 1 Jul 2011 08:58:59 +0000 (11:58 +0300)]
Re-apply licenseheader text in source files for qt4.7

Fixed license text in files having old license.

Reviewed-by: Trust Me
7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Fri, 1 Jul 2011 07:06:04 +0000 (17:06 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
  Symbian socket engine: remove remaining todo comments
  Symbian: tune network autotest heap size so they can run on emulator
  Fix invalid read in QUrl::removeAllEncodedQueryItems
  Push the data together with the error in the synchronous case.

7 years agoMerge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Liang Qi [Fri, 1 Jul 2011 07:00:13 +0000 (09:00 +0200)]
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/s60installs/s60installs.pro

7 years agoMake sure the declarative plugin of QtWebKit is build once.
Alexis Menard [Thu, 30 Jun 2011 19:46:26 +0000 (16:46 -0300)]
Make sure the declarative plugin of QtWebKit is build once.

In the old WebKit the main pro file was not triggering the build of
the declarative plugin therefore it was added as a child of src.pro. It's not
the case anymore.

Reviewed-by: Andreas Kling
7 years agoDoc: Fixing typo
Sergio Ahumada [Thu, 30 Jun 2011 21:44:57 +0000 (23:44 +0200)]
Doc: Fixing typo

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 30 Jun 2011 21:10:40 +0000 (07:10 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Update 4.8.0 changes file

7 years agoUpdate 4.8.0 changes file
Shane Kearns [Thu, 30 Jun 2011 16:18:33 +0000 (17:18 +0100)]
Update 4.8.0 changes file

7 years agoThe qmlshadersplugin deployment must be scoped same as its building
Miikka Heikkinen [Thu, 30 Jun 2011 14:31:07 +0000 (17:31 +0300)]
The qmlshadersplugin deployment must be scoped same as its building

The check "contains(QT_CONFIG, opengl)" is used to include shaders
subdir, so the same check needs to be used when defining deployment
for shaders in s60installs.pro

Task-number: QTBUG-20192
Reviewed-by: TrustMe
7 years agoSymbian socket engine: remove remaining todo comments
Shane Kearns [Thu, 30 Jun 2011 13:52:57 +0000 (14:52 +0100)]
Symbian socket engine: remove remaining todo comments

The writes >16k blocking in the emulator only applies to the winsock
connectivity used in S60 SDKs. It doesn't affect the ethernet
connectivity used by platform environments.

Restarting notifier after error seems like the correct thing to do,
and isn't causing any problems.

The duplicated code for setting error strings is unfortunate, but a
consequence of our decision not to derive from the native socket engine.
If symbian ever gets a Qt5 port, we should revisit it there.

Task-number: QTBUG-18371
Reviewed-by: Markus Goetz
7 years agoSymbian: tune network autotest heap size so they can run on emulator
Shane Kearns [Thu, 30 Jun 2011 13:15:28 +0000 (14:15 +0100)]
Symbian: tune network autotest heap size so they can run on emulator

Heap sizes were increased during development due to OOM failures,
but the tests cannot be launched on emulator because of the address space
problem (symbian emulator known issue)
As the OOM failures were caused by unlimited buffering in the proxy socket
engines (fixed by c4727a85eed57a4db698326a1bed4aa75b6e5284) the tests
work on both emulator and hardware with the new buffer size.

Task-number: QTBUG-18221
Reviewed-by: Markus Goetz
7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Thu, 30 Jun 2011 13:56:25 +0000 (23:56 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
  Fix resource leak in QFontEngineDirectWrite

7 years agoDo not try to open VKB if it is already open in Symbian
Miikka Heikkinen [Thu, 30 Jun 2011 12:16:10 +0000 (15:16 +0300)]
Do not try to open VKB if it is already open in Symbian

If QEvent::RequestSoftwareInputPanel was handled when there was already
an active virtual keyboard that had a child dialog open such as symbol
or writing language selection dialog, the VKB would be brought to
foreground on top of the  child dialog, causing several problems, such
as options menu and letter keys no longer working in VKB.

Fixed by checking if VKB is already open before opening it again.

Task-number: QT-5133
Reviewed-by: Sami Merila
7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team
Qt Continuous Integration System [Thu, 30 Jun 2011 12:12:50 +0000 (22:12 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team:
  Make sure JavaScriptCore is build once.

7 years agoMake sure JavaScriptCore is build once.
Alexis Menard [Thu, 30 Jun 2011 12:04:42 +0000 (09:04 -0300)]
Make sure JavaScriptCore is build once.

In the old WebKit the main pro file was not triggering the build of
JavaScriptCore therefore it was added as a child of src.pro. It's not
the case anymore.

Reviewed-by: Andreas Kling
7 years agoIntroduce QPixmap::fromSymbianRSgImage(RSgImage*) to GL engine
Jani Hautakangas [Thu, 30 Jun 2011 11:28:39 +0000 (14:28 +0300)]
Introduce QPixmap::fromSymbianRSgImage(RSgImage*) to GL engine

Initial implementation of QPixmap::fromSymbianRSgImage(RSgImage*)
on OpenGL graphics system.

Task-number: QTBUG-15254
Reviewed-by: Laszlo Agocs
7 years agoFix resource leak in QFontEngineDirectWrite
Eskil Abrahamsen Blomfeldt [Thu, 30 Jun 2011 10:54:46 +0000 (12:54 +0200)]
Fix resource leak in QFontEngineDirectWrite

Bug introduced by f54c5d9133d7aa7636988db36fa6cc51d26434b6. The release
statement has to come before the return statement :)

Reviewed-by: Jiang Jiang
7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Thu, 30 Jun 2011 10:41:48 +0000 (20:41 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
  Fix transformations on DirectWrite rasterized text

7 years agoFix transformations on DirectWrite rasterized text
Eskil Abrahamsen Blomfeldt [Thu, 30 Jun 2011 09:57:09 +0000 (11:57 +0200)]
Fix transformations on DirectWrite rasterized text

There were a few bugs in the DirectWrite font engine that caused
transformed text to break.

First of all, alphaMapForGlyph() ignored the transform, so no gray
antialiased text would be transformed.

Second of all, the imageForGlyph() function would use the wrong
bounding box for the rasterized glyph, causing its positioning to
become a little bit off when rotating. The fix is to get the bounding
box from the system and add a margin to this instead of trying to predict
how it will appear after the vertical hinting etc. has been applied.

So that the positioning metrics are in sync with the actual metrics used
by the alphaMap* functions, we also need to implement the
alphaMapBoundingBox() function.

Task-number: QTBUG-19829
Reviewed-by: Jiang Jiang
7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Thu, 30 Jun 2011 09:22:35 +0000 (19:22 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
  Cocoa: QFileDialog: fix filename filter not applied correctly

7 years agoCocoa: QFileDialog: fix filename filter not applied correctly
Richard Moe Gustavsen [Thu, 30 Jun 2011 09:14:32 +0000 (11:14 +0200)]
Cocoa: QFileDialog: fix filename filter not applied correctly

From before, the filename filters set on the dialog were matched
against the full patch of the filenames shown in the dialog. The
correct way is to only match it against the filename. This becomes
evident if you set a filter that has no wild cards, e.g "qmake"

Rev-By: jbache
7 years agoTry again to fix flickable velocity on Mac.
Martin Jones [Thu, 30 Jun 2011 07:09:34 +0000 (17:09 +1000)]
Try again to fix flickable velocity on Mac.

Change-Id: Id2693a69739886f9a171f3f6438a5404dff8e901
Task-number: QTBUG-19676
Reviewed-by: Bea Lam