qt:qt.git
12 years agoMerge branch 'mmfphonon' into 4.6
Frans Englich [Wed, 10 Mar 2010 13:13:58 +0000 (14:13 +0100)]
Merge branch 'mmfphonon' into 4.6

12 years agoFix SDP files are not supported.
Frans Englich [Fri, 5 Mar 2010 15:24:48 +0000 (16:24 +0100)]
Fix SDP files are not supported.

The Phonon glue code rejected SDPs based on the MIME type for SDPs.

Task-number: QTBUG-8702
Reviewed-by: Gareth Stockwell
12 years agoFix build break caused by undefined symbol SetDialogPreference
Miikka Heikkinen [Wed, 10 Mar 2010 09:45:02 +0000 (11:45 +0200)]
Fix build break caused by undefined symbol SetDialogPreference

A recent sym_iap_util.h change make it depend on different libraries.
Fixed LIBS statements on relevant examples and demos.

Reviewed-by: Janne Anttila
12 years agoRenamed test benchmark targets.
Miikka Heikkinen [Tue, 9 Mar 2010 13:59:53 +0000 (15:59 +0200)]
Renamed test benchmark targets.

Many of the benchmarks generate executables with same names as
the autotests. This is a big problem for Symbian, where all binaries
are stored into single directory. Renamed benchmark targets to include
'bench' in their name to ensure no overlap in target names.

Part of QtP delta reduction effort.

Reviewed-by: Liang Qi
12 years agoAdded check for null pointer in qt_vg_unregister_pixmap.
Miikka Heikkinen [Tue, 9 Mar 2010 13:02:25 +0000 (15:02 +0200)]
Added check for null pointer in qt_vg_unregister_pixmap.

The method qt_vg_unregister_pixmap is sometimes called when the
QVGSharedContext is already destroyed. Do not try to access it
if it is null.

Part of QtP delta reduction effort.

Reviewed-by: Jason Barron
12 years agoAdd '.' dir as the first include directory in Symbian
Miikka Heikkinen [Tue, 9 Mar 2010 12:51:06 +0000 (14:51 +0200)]
Add '.' dir as the first include directory in Symbian

RVCT seems to use '.' directory implictly as the first include path,
but WINSCW compiler doesn't do this, so add it explicitly to make sure
both builds have similar include order.

Part of QtP delta reduction effort.

Reviewed-by: Janne Anttila
12 years agoEnabled some examples by default in Symbian builds
Miikka Heikkinen [Tue, 9 Mar 2010 12:38:40 +0000 (14:38 +0200)]
Enabled some examples by default in Symbian builds

Part of QtP delta reduction effort.

Reviewed-by: Janne Anttila
12 years agoAdded forwarding headers for qplatformdefs.h in Symbian mkspecs
Miikka Heikkinen [Tue, 9 Mar 2010 11:18:30 +0000 (13:18 +0200)]
Added forwarding headers for qplatformdefs.h in Symbian mkspecs

Missing qplatformdefs.h file caused configure to fail on Linux
environments.

Part of QtP delta reduction effort.

Reviewed-by: axis
12 years agoQUnixPrintWidget should not be declared in Symbian
Miikka Heikkinen [Tue, 9 Mar 2010 10:37:39 +0000 (12:37 +0200)]
QUnixPrintWidget should not be declared in Symbian

Having QUnixPrintWidget declaration causes build breaks in some
environments, so defined it out in Symbian.

Part of QtP delta reduction effort.

Reviewed-by: Janne Anttila
12 years agoFix sqlite3_v9.2.zip to export sqlite3.iby to correct location.
Miikka Heikkinen [Tue, 9 Mar 2010 10:18:03 +0000 (12:18 +0200)]
Fix sqlite3_v9.2.zip to export sqlite3.iby to correct location.

sqlite3.iby needs to be exported under epoc32/rom/include/core/mw,
instead of epoc32/rom/include.

Part of QtP delta reduction effort

Reviewed-by: TrustMe
12 years agoExport qtdemoapps.iby to proper location
Miikka Heikkinen [Tue, 9 Mar 2010 10:08:30 +0000 (12:08 +0200)]
Export qtdemoapps.iby to proper location

Part of QtP delta reduction effort

Reviewed-by: Janne Anttila
12 years agoAdded some missing IBY export paths to platform_path.prf
Miikka Heikkinen [Tue, 9 Mar 2010 10:06:03 +0000 (12:06 +0200)]
Added some missing IBY export paths to platform_path.prf

Also removed some IBY export paths that target layers below middleware,
as those are not likely to be ever needed by Qt projects, since Qt
itself is part of the middleware layer.

Reviewed-by: Janne Anttila
12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Wed, 10 Mar 2010 10:54:03 +0000 (11:54 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fixed paint crash in Symbian for trasnclucent dialogs.
  Implemented QLibraryInfo::TranslationsPath for Symbian.

12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Wed, 10 Mar 2010 08:43:59 +0000 (09:43 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fixes QSqlThread autotest
  Parallelize DB autotests, also some factorization

12 years agoFixed paint crash in Symbian for trasnclucent dialogs.
Janne Anttila [Wed, 10 Mar 2010 08:18:03 +0000 (10:18 +0200)]
Fixed paint crash in Symbian for trasnclucent dialogs.

In Symbian Qt::WA_TrasnclucentBackground is set for QDialogs.

In QTBUG-8706 there is setVisible(false) call for widget before
orientation is switched from portrait to landscape with SW APIs.
This setVisible call invalidates/marks the widget area, basically
whole portrait screen (0,0, 360, 640 in 5800XM) dirty.
The orientation switch changes backingstore/windowsurface size to
640, 360, and invalidates that area. As an consequnce the widget
dirty area after these two operations is 0, 0, 640, 640.

Now when the widget is made visible again, the dirty region is
larger than a screen and causes a crash when trying to access
windowsurface bitmap data outside its bounds.

Fixed the issue by using QPainter instead of own implementation.
QPainter handles intersecting with image automatically. Another
benefit of QPainter is that it uses platform specific drawHelpers
if available to speed-up drawing.

Task-number: QTBUG-8706
Reviewed-by: Jani Hautakangas
12 years agoFixes QSqlThread autotest
Bill King [Wed, 10 Mar 2010 07:01:00 +0000 (17:01 +1000)]
Fixes QSqlThread autotest

12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integr...
Qt Continuous Integration System [Wed, 10 Mar 2010 06:18:47 +0000 (07:18 +0100)]
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:
  Fixed deadlock introduced by change
  Fixed invokeMethod in alsa implementation.

12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Bill King [Wed, 10 Mar 2010 03:43:52 +0000 (13:43 +1000)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6

12 years agoParallelize DB autotests, also some factorization
Bill King [Wed, 10 Mar 2010 03:41:29 +0000 (13:41 +1000)]
Parallelize DB autotests, also some factorization

Add local machine parallelization of auto-tests, not just host to host.

Reviewed-by: Justin McPherson
12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6
Kurt Korbatits [Wed, 10 Mar 2010 02:09:43 +0000 (12:09 +1000)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6

12 years agoFixed deadlock introduced by change
Kurt Korbatits [Wed, 10 Mar 2010 02:06:52 +0000 (12:06 +1000)]
Fixed deadlock introduced by change
83e73a69d5a1c6b94c5c83f91141f35d65d27f36.
alsa callback was deadlocking with QEventDispatcherGlib.

Reviewed-by:Dmytro Poplavskiy

12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integr...
Qt Continuous Integration System [Wed, 10 Mar 2010 01:40:56 +0000 (02:40 +0100)]
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:
  Fixed invokeMethod in alsa implementation.

12 years agoFixed invokeMethod in alsa implementation.
Kurt Korbatits [Wed, 10 Mar 2010 00:01:11 +0000 (10:01 +1000)]
Fixed invokeMethod in alsa implementation.

Reviewed-by:Dmytro Poplavskiy

12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Tue, 9 Mar 2010 23:32:22 +0000 (00:32 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Compile without QT3_SUPPORT
  Improve scrolling in DirectFB

12 years agoCompile without QT3_SUPPORT
Anders Bakken [Tue, 9 Mar 2010 22:35:51 +0000 (14:35 -0800)]
Compile without QT3_SUPPORT

QList<T>::remove() is QT3_SUPPORT, replace with erase().

Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Tue, 9 Mar 2010 21:28:41 +0000 (22:28 +0100)]
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:
  fix qm file installation from shadow build
  Added very simple JPEG loading benchmark (using QImageReader)

12 years agofix qm file installation from shadow build
Oswald Buddenhagen [Tue, 9 Mar 2010 19:18:20 +0000 (20:18 +0100)]
fix qm file installation from shadow build

12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Tue, 9 Mar 2010 19:12:30 +0000 (20:12 +0100)]
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:
  Added very simple JPEG loading benchmark (using QImageReader)

12 years agoImprove scrolling in DirectFB
Anders Bakken [Tue, 9 Mar 2010 17:49:31 +0000 (09:49 -0800)]
Improve scrolling in DirectFB

Since DirectFB always uses the front buffer of a double buffered surface
as the source when blitting we needed to make sure that the front buffer
was valid and hence we called Flip for each scroll. This had negative
performance impacts since you could end up with various parts of a
window being updated at different times.

With this patch we store whether the front-buffer is up to date inside
the window surface and only call Flip in scroll if it's not.

Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Tue, 9 Mar 2010 16:54:16 +0000 (17:54 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Memory leak!
  Cursor would remain in a non-focused QLineEdit after clearing its selection

12 years agoMemory leak!
Gabriel de Dietrich [Tue, 9 Mar 2010 16:16:02 +0000 (17:16 +0100)]
Memory leak!

Multiple insertions of the same (key, value) pair in a QMultiHash.

Reviewed-by: Olivier
Task-number: QTBUG-8862

12 years agoAdded very simple JPEG loading benchmark (using QImageReader)
Markus Goetz [Tue, 9 Mar 2010 14:53:26 +0000 (15:53 +0100)]
Added very simple JPEG loading benchmark (using QImageReader)

Reviewed-by: joao
12 years agoCursor would remain in a non-focused QLineEdit after clearing its selection
Gabriel de Dietrich [Tue, 9 Mar 2010 14:39:40 +0000 (15:39 +0100)]
Cursor would remain in a non-focused QLineEdit after clearing its selection

QLineEditPrivate::_q_selectionChanged() did not take into account
whether the widget had focus.

Reviewed-by: Olivier
Task-number: QTBUG-8634

12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Tue, 9 Mar 2010 14:40:03 +0000 (15:40 +0100)]
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:
  Get the printDialog to check for default paperSize via CUPS

12 years agoGet the printDialog to check for default paperSize via CUPS
Pierre Rossi [Tue, 9 Mar 2010 14:24:19 +0000 (15:24 +0100)]
Get the printDialog to check for default paperSize via CUPS

Task-number: QTBUG-6471
Reviewed-by: Trond
12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Tue, 9 Mar 2010 11:13:17 +0000 (12:13 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  QGraphicsSceneEvent: add Q_DISABLE_COPY

12 years agoQGraphicsSceneEvent: add Q_DISABLE_COPY
Olivier Goffart [Tue, 9 Mar 2010 11:07:09 +0000 (12:07 +0100)]
QGraphicsSceneEvent: add Q_DISABLE_COPY

Add Q_DISABLE_COPY to QGraphicsSceneEvent and all the sublasses

The code would anyway not compile before as the QScopedPointer does
not know QGraphicsSceneEventPrivate in use code.
But now we have better error reporting.

Reviewed-by: Thierry
Task-number: QTBUG-8803 (related)

12 years agoImplemented QLibraryInfo::TranslationsPath for Symbian.
Janne Anttila [Tue, 9 Mar 2010 07:37:35 +0000 (09:37 +0200)]
Implemented QLibraryInfo::TranslationsPath for Symbian.

Discussed with QtProd and they agreed "/resource/qt/translations"
would be suitable path to return from QLibraryInfo::TranslationsPath.

Task-number: QTBUG-8291
Reviewed-by: Miikka Heikkinen
12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Tue, 9 Mar 2010 06:15:39 +0000 (07:15 +0100)]
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:
  Fix obsolete URL's.

12 years agoFix obsolete URL's.
Jason McDonald [Tue, 9 Mar 2010 06:08:44 +0000 (16:08 +1000)]
Fix obsolete URL's.

Task-number: QT-3051
Reviewed-by: Trust Me
12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Mon, 8 Mar 2010 22:08:47 +0000 (23:08 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Don't use DirectFB for non-existing pixmaps

12 years agoDon't use DirectFB for non-existing pixmaps
Anders Bakken [Mon, 8 Mar 2010 21:13:27 +0000 (13:13 -0800)]
Don't use DirectFB for non-existing pixmaps

DirectFB will print a warning for this since the file doesn't exist but
we might as well not try when we know the file doesn't exist.

Reviewed-by: Donald Carr <donald.carr@nokia.com>
12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Mon, 8 Mar 2010 19:52:22 +0000 (20:52 +0100)]
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:
  QXmlSchema internals: include/import/redefine schemas only once

12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Mon, 8 Mar 2010 17:41:55 +0000 (18:41 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  remove unneeded function pointer in qmenu_wince.cpp
  Updated the QCursor docs regarding XOR'ed cursors.

12 years agoQXmlSchema internals: include/import/redefine schemas only once
Peter Hartmann [Wed, 24 Feb 2010 15:45:30 +0000 (16:45 +0100)]
QXmlSchema internals: include/import/redefine schemas only once

According to the Schema standard, loading a schema needs only be done
once for each schema location. Currently, there was a problem with
indirect includes (and imports/redefines):

   a      In this scenario, schema a would only remember to have loaded
  / \     b, but not d, which resulted in an error when c was loading d
 b   c    again and the types in d were redefined.
 |   |
 d   d

Reviewed-by: Tobias Koenig <tokoe@kde.org>
Task-number: QTBUG-8394

12 years agoremove unneeded function pointer in qmenu_wince.cpp
Joerg Bornemann [Mon, 8 Mar 2010 16:18:45 +0000 (17:18 +0100)]
remove unneeded function pointer in qmenu_wince.cpp

Reviewed-by: mauricek
12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Mon, 8 Mar 2010 15:41:07 +0000 (16:41 +0100)]
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:
  QHostInfo: Compile fix

12 years agoQHostInfo: Compile fix
Markus Goetz [Mon, 8 Mar 2010 15:21:56 +0000 (16:21 +0100)]
QHostInfo: Compile fix

Reviewed-by: TrustMe
12 years agoUpdated the QCursor docs regarding XOR'ed cursors.
Trond Kjernåsen [Mon, 8 Mar 2010 14:14:18 +0000 (15:14 +0100)]
Updated the QCursor docs regarding XOR'ed cursors.

XOR'ed cursors under X11 or Mac OS X have never been supported by Qt,
and the doc updates done some time ago where not correct.

Task-number: related to QTBUG-1838
Reviewed-by: Gunnar
12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Mon, 8 Mar 2010 13:26:24 +0000 (14:26 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fix undocked widgets not being restored correctly as part of the layout

12 years agoFix undocked widgets not being restored correctly as part of the layout
Thierry Bastian [Mon, 8 Mar 2010 13:07:32 +0000 (14:07 +0100)]
Fix undocked widgets not being restored correctly as part of the layout

Task-number: QTBUG-7921
Reviewed-by: ogoffart
12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Mon, 8 Mar 2010 11:06:10 +0000 (12:06 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Prevent QRegion from crashing on large coordinates.

12 years agoPrevent QRegion from crashing on large coordinates.
Samuel Rødal [Mon, 8 Mar 2010 10:52:20 +0000 (11:52 +0100)]
Prevent QRegion from crashing on large coordinates.

Since we don't clip the x-coordinates that end up in the edge table of
the QRegion rasterizer, we need to extend the coordinate range.

Task-number: QTBUG-7699
Reviewed-by: Gunnar Sletta
12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Mon, 8 Mar 2010 03:28:10 +0000 (04:28 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  QTableView: fix navigating with keyboard with spans not scrolling

12 years agoQTableView: fix navigating with keyboard with spans not scrolling
Olivier Goffart [Mon, 8 Mar 2010 02:28:01 +0000 (03:28 +0100)]
QTableView: fix navigating with keyboard with spans not scrolling

We cannot use isIndexHidden in ScrollTo because that would return
true if the index is in a span.

Task-number: QTBUG-8777
Reviewed-by: Markus Goetz
12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Fri, 5 Mar 2010 21:59:12 +0000 (22:59 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Compile with DirectFB version >= 1.2.0 && < 1.2.9
  QDirectFBPaintEngine optimization
  Add some warnings when using DISABLE/WARN in DFB

12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Fri, 5 Mar 2010 19:46:59 +0000 (20:46 +0100)]
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:
  Fix build with Mesa 7.8's EGL implementatioon
  Reset the byte order in the iconv codec after using it.
  fix "using namespace" recursion crash
  Fixed key mappings on X11
  QDom: prevent infinite loop when cloning a DTD
  QPrintPreviewDialog number of pages is partially blocked from view in OSX
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( f3110d2f94c825477afac054ed448e45d47f5670 )

12 years agoCompile with DirectFB version >= 1.2.0 && < 1.2.9
Anders Bakken [Fri, 5 Mar 2010 19:37:04 +0000 (11:37 -0800)]
Compile with DirectFB version >= 1.2.0 && < 1.2.9

DSPF_DST was added in 1.2.9, not in 1.2.0

Reviewed-by: muthu <qt-info@nokia.com>
12 years agoQDirectFBPaintEngine optimization
Anders Bakken [Fri, 5 Mar 2010 18:17:59 +0000 (10:17 -0800)]
QDirectFBPaintEngine optimization

If you call fillRect(QBrush(QColor())); we should short-circuit before
falling back to the raster engine.

Reviewed-by: muthu <qt-info@nokia.com>
12 years agoAdd some warnings when using DISABLE/WARN in DFB
Anders Bakken [Fri, 5 Mar 2010 18:00:01 +0000 (10:00 -0800)]
Add some warnings when using DISABLE/WARN in DFB

If you specify an operation that is not recognized in
QT_DIRECTFB_WARN_ON_RASTERFALLBACKS or
QT_DIRECTFB_DISABLE_RASTERFALLBACKS

Reviewed-by: muthu <qt-info@nokia.com>
12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Fri, 5 Mar 2010 17:28:30 +0000 (18:28 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Compile fix for Windows Mobile and OpenGLES2
  Wrong dirty region after row selection in right-to-left mode in QTableView
  Fixes: Mysql truncation of integer values + some autotest cleanup

12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Fri, 5 Mar 2010 17:09:35 +0000 (18:09 +0100)]
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:
  Fix build with Mesa 7.8's EGL implementatioon
  Reset the byte order in the iconv codec after using it.
  fix "using namespace" recursion crash
  Fixed key mappings on X11
  QDom: prevent infinite loop when cloning a DTD
  QPrintPreviewDialog number of pages is partially blocked from view in OSX
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( f3110d2f94c825477afac054ed448e45d47f5670 )

12 years agoFix build with Mesa 7.8's EGL implementatioon
Bernhard Rosenkraenzer [Fri, 5 Mar 2010 16:06:36 +0000 (17:06 +0100)]
Fix build with Mesa 7.8's EGL implementatioon

Without this change, when Mesa 7.8 is used, qtextstream.h (included
by qdebug.h) complains that it has to be included before any header
that defines Status

Merge-request: 483
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
12 years agoReset the byte order in the iconv codec after using it.
Thiago Macieira [Fri, 5 Mar 2010 13:57:01 +0000 (14:57 +0100)]
Reset the byte order in the iconv codec after using it.

Otherwise, if you try run
    QString(QChar(0xfffe)).toLocal8Bit()
iconv will be left in byte-swapping mode.

Reviewed-by: Denis Dzyubenko
12 years agofix "using namespace" recursion crash
Oswald Buddenhagen [Fri, 5 Mar 2010 14:59:37 +0000 (15:59 +0100)]
fix "using namespace" recursion crash

Task-number: QTBUG-8360

12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Fri, 5 Mar 2010 14:50:20 +0000 (15:50 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fix for QTBUG-6659 Parent window accepts pointer events wrongly
  If no IAP defined force IAP dialog
  QS60Style ignores widget palette when drawing highlighted widget text
  Fix for QTBUG-8762 QApplication::setGraphicsSystem("raster") crashes.
  Fixed crash at application exit when QProcess was used in Symbian
  QMessageBox is not stretched to screen width if the content is narrow
  Tab to space fixes to qdilaog.cpp

12 years agoFix for QTBUG-6659 Parent window accepts pointer events wrongly
Jani Hautakangas [Fri, 5 Mar 2010 14:40:04 +0000 (16:40 +0200)]
Fix for QTBUG-6659 Parent window accepts pointer events wrongly

Parent window accepted pointer events even though the child was modal.
That was because closing popup didn't restore pointer grab for modal
window.

Task-number: QTBUG-6659
Reviewed-by: axis
12 years agoIf no IAP defined force IAP dialog
Aleksandar Sasha Babic [Fri, 5 Mar 2010 13:43:34 +0000 (14:43 +0100)]
If no IAP defined force IAP dialog

Using TCommDbConnPref to force IAP dialog when IAP is not defined

Reviewed-by: TrustMe
12 years agoFixed key mappings on X11
Denis Dzyubenko [Fri, 5 Mar 2010 10:08:33 +0000 (11:08 +0100)]
Fixed key mappings on X11

Merge request #1742 (6c8c1c5322a26d789165783d7df3e29c672690cb) changed the
behavior of one of the keys on X11, this fixes it back and documents that on
X11 the key binding is a bit weird - XF86XK_MyComputer is mapped to
Qt::Key_Launch0, XF86XK_Launch0 is mapped to Qt::Key_Launch3 and so on.

Task-number: QTBUG-7063
Reviewed-by: Marius Storm-Olsen
12 years agoQDom: prevent infinite loop when cloning a DTD
Peter Hartmann [Fri, 5 Mar 2010 10:28:32 +0000 (11:28 +0100)]
QDom: prevent infinite loop when cloning a DTD

we forgot to advance the pointer to the current node.

Reviewed-by: Frans Englich
Task-number: QTBUG-8398

12 years agoCompile fix for Windows Mobile and OpenGLES2
ninerider [Fri, 5 Mar 2010 12:37:17 +0000 (13:37 +0100)]
Compile fix for Windows Mobile and OpenGLES2

The native device is now the default screen device.

12 years agoQPrintPreviewDialog number of pages is partially blocked from view in OSX
Carlos Manuel Duclos Vergara [Fri, 5 Mar 2010 10:53:39 +0000 (11:53 +0100)]
QPrintPreviewDialog number of pages is partially blocked from view in OSX

The problem here is caused by the FormLayout. This patch queries the
widget for its sizeHint and then forces it to resize to that size.
Once that is done, we add the widget to the layout.
Code is #ifdef protected so other platforms are not affected by it.

Task-number: QTBUG-7760
Reviewed-by: Trond
12 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Sami Merila [Fri, 5 Mar 2010 09:51:48 +0000 (11:51 +0200)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6

12 years agoQS60Style ignores widget palette when drawing highlighted widget text
Sami Merila [Fri, 5 Mar 2010 09:48:35 +0000 (11:48 +0200)]
QS60Style ignores widget palette when drawing highlighted widget text

Currently: QS60Style does not polish widgets with highlight colors.
Instead it fetches color information from native theme side and uses
that color for drawing the text.

http://bugreports.qt.nokia.com/browse/QTBUG-8704

Fix: All widgets with highlighted text (lists, tables, headers, tabs,
radiobuttons and checkboxes) polish their palette. This palette
value is then used in the drawing code. Earlier it was not possible
for developers to define their own highlight text color, now it is
possible.

Task-number: QTBUG-8704
Reviewed-by: Janne Anttila
12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Fri, 5 Mar 2010 09:26:07 +0000 (10:26 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Wrong dirty region after row selection in right-to-left mode in QTableView
  Fixes: Mysql truncation of integer values + some autotest cleanup

12 years agoFix for QTBUG-8762 QApplication::setGraphicsSystem("raster") crashes.
Jani Hautakangas [Fri, 5 Mar 2010 09:22:12 +0000 (11:22 +0200)]
Fix for QTBUG-8762 QApplication::setGraphicsSystem("raster") crashes.

QRasterGraphicsSystem tries to create QRasterPixmapData and
QRasterWindowSurface if QApplication::setGraphicsSystem("raster")
is used. On Symbian it should create QS60PixmapData and QS60WindowSurface.

Task-number: QTBUG-8762
Reviewed-by: Jason Barron
12 years agoFixed crash at application exit when QProcess was used in Symbian
Miikka Heikkinen [Fri, 5 Mar 2010 09:10:57 +0000 (11:10 +0200)]
Fixed crash at application exit when QProcess was used in Symbian

QProcessManagerMediator and QProcessActive were not properly canceled
in their destructors, causing crash when global static QProcessManager
was deleted.

Task-number: QTBUG-7735
Reviewed-by: Janne Anttila
12 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Sami Merila [Fri, 5 Mar 2010 09:08:37 +0000 (11:08 +0200)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6

12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Fri, 5 Mar 2010 09:07:17 +0000 (10:07 +0100)]
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 ( f3110d2f94c825477afac054ed448e45d47f5670 )

12 years agoQMessageBox is not stretched to screen width if the content is narrow
Sami Merila [Fri, 5 Mar 2010 09:05:54 +0000 (11:05 +0200)]
QMessageBox is not stretched to screen width if the content is narrow

Currently;
If content of QMessageBox in S60 is less than messagebox's softlimit,
messagebox is not stretched to screen width.

http://bugreports.qt.nokia.com/browse/QTBUG-5539

Fix:
Regardless of content width, messagebox is stretched to screen width.

Task-number: QTBUG-5539
Reviewed-by: Janne Anttila
12 years agoWrong dirty region after row selection in right-to-left mode in QTableView
Gabriel de Dietrich [Thu, 4 Mar 2010 16:00:46 +0000 (17:00 +0100)]
Wrong dirty region after row selection in right-to-left mode in QTableView

When computing the region from the selection range, we didn't take
care of the actual position of the cells, which is reverted when in
RtoL mode. Also gets fixed a 2-pixel error introduced in commit
718905c097a7f3bbf9805a2561cd855a0b2d8f59, and that was responsible for
(potentialy) painting more cells than needed.

Auto-test included.

Reviewed-by: Olivier
Task-number: QTBUG-7774

12 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( f3110d...
Simon Hausmann [Fri, 5 Mar 2010 08:09:56 +0000 (09:09 +0100)]
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( f3110d2f94c825477afac054ed448e45d47f5670 )

Changes in WebKit/qt since the last update:

++ b/WebKit/qt/ChangeLog
2010-03-04  Simon Hausmann  <simon.hausmann@nokia.com>

        Reviewed by Kenneth Rohde Christiansen.

        [Qt] qwebelement.h does not include QtCore headers correctly
        https://bugs.webkit.org/show_bug.cgi?id=35748

        The header files of QtCore must be included as QtCore/foo.h.

        See also http://bugreports.qt.nokia.com/browse/QTBUG-8661

        * Api/qwebelement.h:

12 years agoTab to space fixes to qdilaog.cpp
Janne Anttila [Wed, 3 Mar 2010 14:15:22 +0000 (16:15 +0200)]
Tab to space fixes to qdilaog.cpp

Reviewed-By: TrustMe
12 years agoFixes: Mysql truncation of integer values + some autotest cleanup
Bill King [Fri, 5 Mar 2010 06:53:54 +0000 (16:53 +1000)]
Fixes: Mysql truncation of integer values + some autotest cleanup

Task-number: QTBUG-5765

12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Fri, 5 Mar 2010 06:51:01 +0000 (07:51 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fixed crash in Symbian when having empty QMenu in menubar.

12 years agoFixed crash in Symbian when having empty QMenu in menubar.
Janne Anttila [Thu, 4 Mar 2010 13:45:33 +0000 (15:45 +0200)]
Fixed crash in Symbian when having empty QMenu in menubar.

Typically cascade menus in Symbian/S60 are created from resources.
When cascade menus are defined in resources the RestoreMenuL is
responsible for instantiating the cascade menu item array and items.

In Qt for Symbian the menus need to be created dynamically from
QActions, that's why RestoreMenuL is reimplemeted in Qt for Symbian
to dynamically init the menu pane content. Adding a first dynamic
item to cascase menu pane creates the CEikMenuPane internal item array.
In case where empty QMenu was added to QMenubar, the item array for
cascade menupane was never constructed. Then later on CEikMenuPane code
assumes that item array exist. To avoid access violation crash we now
create the item array manually when building submenu.

Task-number: QTBUG-4897
Reviewed-by: Jason Barron
12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Fri, 5 Mar 2010 03:51:20 +0000 (04:51 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Update documentation with warning about setForwardOnly
  Make the star example recreate its path if the VG context is destroyed.
  Image drawing in OpenVG was off by 0.5 of a pixel

12 years agoUpdate documentation with warning about setForwardOnly
Bill King [Fri, 5 Mar 2010 03:09:08 +0000 (13:09 +1000)]
Update documentation with warning about setForwardOnly

Task-number: QTBUG-8752

12 years agoMake the star example recreate its path if the VG context is destroyed.
Rhys Weatherley [Fri, 5 Mar 2010 02:39:17 +0000 (12:39 +1000)]
Make the star example recreate its path if the VG context is destroyed.

Task-number: QT-2809
Reviewed-by: trustme
12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Rhys Weatherley [Fri, 5 Mar 2010 01:55:45 +0000 (11:55 +1000)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6

12 years agoImage drawing in OpenVG was off by 0.5 of a pixel
Rhys Weatherley [Fri, 5 Mar 2010 01:52:10 +0000 (11:52 +1000)]
Image drawing in OpenVG was off by 0.5 of a pixel

Path transforms need to be adjusted by 0.5 for the difference
in OpenVG and Qt co-ordinate systems.  Image transforms do not
need to be adjusted because OpenVG implicitly adjusts by 0.5.

Task-number: QT-2999
Reviewed-by: Sarah Smith
12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Fri, 5 Mar 2010 01:44:59 +0000 (02:44 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  When using OpenVG alpha mask, turn off scissor-as-mask

12 years agoWhen using OpenVG alpha mask, turn off scissor-as-mask
Rhys Weatherley [Fri, 5 Mar 2010 00:08:52 +0000 (10:08 +1000)]
When using OpenVG alpha mask, turn off scissor-as-mask

Task-number: QT-3033
Reviewed-by: Julian de Bhal
12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integr...
Qt Continuous Integration System [Thu, 4 Mar 2010 23:48:50 +0000 (00:48 +0100)]
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:
  Linux QAudioOutput playback stuttering

12 years agoLinux QAudioOutput playback stuttering
Kurt Korbatits [Thu, 4 Mar 2010 23:41:53 +0000 (09:41 +1000)]
Linux QAudioOutput playback stuttering
Adjust buffer and period sizes if system cannot work with defaults
(alsa).

Task-number:QTBUG-8339
Reviewed-by:Derick Hawcroft

12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Thu, 4 Mar 2010 20:50:46 +0000 (21:50 +0100)]
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:
  tst_qhostinfo: Compile fix
  Document some stuff in QHostInfo and QAbstractSocket
  tst_qhostinfo: Mixed up descriptions for test case data
  qhostinfo benchmark: Use local _data instead of _global
  DNS Cache: Also check inside the DNS threads
  qhostinfo benchmark: Benchmark the with-cache and without-cache
  tst_qftp: Do not use 1.2.3.4 as IP
  Dont use gestures if there is no touch screen.
  showFullscreen() broken if UnifiedTitleAndToolBarOnMac is enabled
  Fix atk warning on startup in Qt apps wit QGtkStyle
  Do not use realpath() with uclibc

12 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Thu, 4 Mar 2010 18:45:08 +0000 (19:45 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Make translucent windows work, and support WA_TranslucentBackground
  Make tablet detection work with new wacom drivers
  Fixed an exit crash that could occur in the GL 2 engine under X11.
  Fix tst_QVariant::operator_eq_eq(UserType)
  SqlBrowser not respecting casings.
  Remove vgClearPath() change to OpenVG paint engine
  QVariant: Fix crash when comparing two variant with the same undefined type.
  Fix compositing when QWS background is completely transparent.
  Fixes wrong composition mode for cached backgrounds in Graphics View.
  Support keypad input with vnc driver

12 years agotst_qhostinfo: Compile fix
Markus Goetz [Thu, 4 Mar 2010 17:01:24 +0000 (18:01 +0100)]
tst_qhostinfo: Compile fix

12 years agoMake translucent windows work, and support WA_TranslucentBackground
Paul Olav Tvete [Thu, 4 Mar 2010 14:53:09 +0000 (15:53 +0100)]
Make translucent windows work, and support WA_TranslucentBackground

QWS will make a window translucent if the background brush is not
opaque. Now we also support the cross-platform way of doing it.
This also includes fixes for bugs caused by behavioural changes in
the internal windowsurface/backingstore implementation.

Task-number: QTBUG-5739
Reviewed-by: Tom
12 years agoDocument some stuff in QHostInfo and QAbstractSocket
Markus Goetz [Thu, 4 Mar 2010 14:28:27 +0000 (15:28 +0100)]
Document some stuff in QHostInfo and QAbstractSocket