qt:qt.git
11 years agoMerge branch 4.6 into qt-4.7-from-4.6
Qt Continuous Integration System [Sun, 10 Oct 2010 22:11:21 +0000 (00:11 +0200)]
Merge branch 4.6 into qt-4.7-from-4.6

11 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Sun, 10 Oct 2010 19:44:01 +0000 (21:44 +0200)]
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:
  Added qmake check for presence of RHttpDownloadMgr header
  qmediaplayer: show buffer status of 0%
  Progressive download in Phonon MMF backend: integrated with player
  Progressive download in Phonon MMF backend: added download managers

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Sat, 9 Oct 2010 17:23:57 +0000 (19:23 +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:
  Add missing data for the autotest of in-place conversion for Pixmap
  Avoid in-place convertion of images with multiple references
  Fix infinite loop when justifying undisplayable Arabic text

11 years agoAdd missing data for the autotest of in-place conversion for Pixmap
Benjamin Poulain [Sat, 9 Oct 2010 15:28:06 +0000 (17:28 +0200)]
Add missing data for the autotest of in-place conversion for Pixmap

The commit 4d974ff0a748b22e668a4cb7ef38101122c85b3b uses an new image
which was not commited with the patch.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Sat, 9 Oct 2010 05:37:03 +0000 (07:37 +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:
  Avoid in-place convertion of images with multiple references
  Fix infinite loop when justifying undisplayable Arabic text

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Fri, 8 Oct 2010 23:00:27 +0000 (01:00 +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:
  Account for native child widgets when handling focus events
  Added support for using inputMethodHints in QInputDialog edit widget.
  Fixed some preprocessor parameters for Mac support.
  Fixed missing QMAKE_MOC definition in certain mkspecs.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Fri, 8 Oct 2010 19:01:10 +0000 (21:01 +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:
  Avoid in-place convertion of images with multiple references
  Fix infinite loop when justifying undisplayable Arabic text

11 years agoAccount for native child widgets when handling focus events
Gareth Stockwell [Fri, 8 Oct 2010 12:25:04 +0000 (13:25 +0100)]
Account for native child widgets when handling focus events

The code previously contained an implicit assumption that the
control which received the FocusChanged event was a top-level
widget.  This meant that focus events delivered to native
child widgets could cause unexpected changes in visibility of
the statusbar and CBA.

Task-number: QTBUG-13761
Reviewed-by: Jason Barron
11 years agoAdded support for using inputMethodHints in QInputDialog edit widget.
axis [Fri, 1 Oct 2010 11:25:28 +0000 (13:25 +0200)]
Added support for using inputMethodHints in QInputDialog edit widget.

AutoTest: Included
Task:     QTBUG-13200
RevBy:    Denis Dzyubenko

11 years agoFixed some preprocessor parameters for Mac support.
axis [Fri, 8 Oct 2010 12:58:44 +0000 (14:58 +0200)]
Fixed some preprocessor parameters for Mac support.

RevBy:    Liang Qi

11 years agoFixed missing QMAKE_MOC definition in certain mkspecs.
axis [Thu, 7 Oct 2010 13:26:47 +0000 (15:26 +0200)]
Fixed missing QMAKE_MOC definition in certain mkspecs.

Also removed the use of DIR_SEPARATOR. It does not get defined until
after symbian.conf has finished parsing.

RevBy:    Miikka Heikkinen

11 years agoAvoid in-place convertion of images with multiple references
Benjamin Poulain [Fri, 8 Oct 2010 12:21:10 +0000 (14:21 +0200)]
Avoid in-place convertion of images with multiple references

The decoding from image reader was assuming the image reader do not
keep the image internally. This is not true for the GIF plugins because
the previous image can be used to compose the current image.

This was causing crash on ARM because the 16 bits color depth causes
the image memory to be reduce by half. When the plugin was accessing
the memory, it assumes the images has not changed and is on 32 bits.

This patch disable the in-place conversion if a detach is required.
Regular conversion is the correct solution in this case, and it can
also be made faster by converting while copying.

Reviewed-by: Andreas Kling
11 years agoFix infinite loop when justifying undisplayable Arabic text
Eskil Abrahamsen Blomfeldt [Fri, 8 Oct 2010 08:55:54 +0000 (10:55 +0200)]
Fix infinite loop when justifying undisplayable Arabic text

If the Arabic text is for some reason undisplayable, e.g. because of
QTBUG-13132, the font engine will be unable to find the tatweel character
and the kashida width may be returned as 0. This would potentially cause
an infinite loop, as "need" would remain >= minKashida forever because
x - 0 is still >= 0.

Task-number: QTBUG-13130
Reviewed-by: Lars
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Fri, 8 Oct 2010 10:01:07 +0000 (12:01 +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:
  Fix memory leak in QPixmap::toSymbianRSgImage() when an error occurs.

11 years agoFix memory leak in QPixmap::toSymbianRSgImage() when an error occurs.
Jason Barron [Fri, 8 Oct 2010 07:08:54 +0000 (09:08 +0200)]
Fix memory leak in QPixmap::toSymbianRSgImage() when an error occurs.

In the cases where an error occured while converting a QPixmap to a
VGImage this function would return without deleting the RSgImage
pointer that it created. Fix is to use a QScopedPointer instead. Also
don't use q_check_ptr() since this isn't a CBase derived class.

In case you are wondering why I didn't use a custom deleter here so
that Close() was also called, we need to make sure that Close() is
called on the RSgImage instance before calling Close() on the driver.

Reviewed-by: mread
11 years agoAdded qmake check for presence of RHttpDownloadMgr header
Gareth Stockwell [Sun, 3 Oct 2010 18:43:29 +0000 (19:43 +0100)]
Added qmake check for presence of RHttpDownloadMgr header

downloadmgrclient.h is not found on S^4 baselines, causing a build
failure.  This commit is a temporary workaround, which disables
progressive download support if the header is not found.

The correct solution is to determine whether the RHttpDownloadMgr
definition has moved, and if so, to modify the .pro file to
include the new path.

Task-number: QTBUG-10769
Reviewed-by: TrustMe
11 years agoqmediaplayer: show buffer status of 0%
Gareth Stockwell [Mon, 27 Sep 2010 17:07:35 +0000 (18:07 +0100)]
qmediaplayer: show buffer status of 0%

During progressive download, it is not possible for the Symbian MMF Phonon
backend to determine the buffering status, so it returns a value of 0%.

This change causes qmediaplayer to display this value in the UI, thereby
giving a visible notification of buffering during progressive download.

Task-number: QTBUG-10769
Reviewed-by: Derick Hawcroft
11 years agoProgressive download in Phonon MMF backend: integrated with player
Gareth Stockwell [Tue, 28 Sep 2010 10:05:41 +0000 (11:05 +0100)]
Progressive download in Phonon MMF backend: integrated with player

This commit integrates the Download class with the media playback
classes in the backend, to implement Progressive Download.

Note that this PDL implementation has one drawback: when video
playback is paused due to shortage of data (i.e. due to the download
being temporarily stalled), the display goes black.  This is because,
when the end of the currently-downloaded data is reached, the
playback session is closed.  When more data becomes available, the
clip is re-opened, a seek is done to reach the previous playback
position, and playback is re-started.  Closing the playback session
closes the video stack's connection to the display, thereby causing
the video widget to go black while more data is buffered.

This is a consequence of the level in the native video stack at which
the Phonon integration is done: managing a network stall without
requiring the playback session to be closed would require integration
below the MMF client API, specifically at the MMF controller level.

Task-number: QTBUG-10769
Reviewed-by: Derick Hawcroft
11 years agoProgressive download in Phonon MMF backend: added download managers
Gareth Stockwell [Tue, 28 Sep 2010 10:01:20 +0000 (11:01 +0100)]
Progressive download in Phonon MMF backend: added download managers

This patch adds a Download class which uses the RHttpDownloadMgr
API to download a media clip over HTTP.

Task-number: QTBUG-10769
Reviewed-by: Derick Hawcroft
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Fri, 8 Oct 2010 02:30:50 +0000 (04:30 +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:
  Fix crash when using Q_GLOBAL_STATIC(QWidget...)
  Removed the need for S60main.rsc resource file in Symbian.

11 years agoMerge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4...
Qt Continuous Integration System [Fri, 8 Oct 2010 00:12:21 +0000 (02:12 +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:
  Fix build with cups 1.5 snapshots

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Thu, 7 Oct 2010 21:40:10 +0000 (23:40 +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: (26 commits)
  Live texture updates to meegographicssystem helper.
  Live texture updates to meegographicssystem plugin.
  Revert the integration of the merge request 2286.
  Fix text rendering in GL when using the broken-fbo-fallback
  ActiveQt: also make the designer plugin for qaxwidget build in the opensource versions
  Fix compilation
  Code cleaning with the merge request 2286
  Fix a pending issue with the merge request 2286
  Doc: fix description of the expected behavior for QGraphicsItem::cursor
  Fixed the build error in qtconfig
  Resolved a little code style issue in qtconfig
  Renamed controls in qtconfig's MainWindow
  Removed inheritance from UI file in qtconfig's MainWindow
  Fixed a bug and resolved some translation issues in qtconfig
  Fixed some problems in qtconfig's PreviewWidget
  Removed the inheritance from ui file in qtconfig's PaletteEditorAdvanced
  Replaced the unnecessary include with declaration
  Resolved some code style issues and fixed the broken copyright year
  Finally removed the qtconfig dependency from qt3support
  Modified previewwidget's ui file in qtconfig
  ...

11 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 Oct 2010 17:40:19 +0000 (19:40 +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:
  Fix the icd auto config test after restructuring the icd plugin dependencies
  Ensure that actions are still fired even if there is no visible window

11 years agoLive texture updates to meegographicssystem helper.
Michael Dominic K [Thu, 7 Oct 2010 16:51:50 +0000 (18:51 +0200)]
Live texture updates to meegographicssystem helper.

Merge-request: 848
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years agoLive texture updates to meegographicssystem plugin.
Michael Dominic K [Thu, 7 Oct 2010 16:51:49 +0000 (18:51 +0200)]
Live texture updates to meegographicssystem plugin.

Merge-request: 848
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 7 Oct 2010 14:12:34 +0000 (16:12 +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:
  Support device orientation in harmattan
  Connect property alias change signals on use
  Doc fix.
  Fix setting PathView offset when all visible items are removed.
  Rename toolbar button.
  Update import statement.
  Fixes assert in QDeclarativeWebView
  Do not show 'More' button when in fullscreen view.
  Set reasonable QT_GUI_DRAG_DISTANCE in mkspecs/linux-g++-maemo/qplatformdefs.h
  Allow default QApplication::startDragDistance() to be defined in platformdefs.h
  Autotest
  Ensure the TextInput cursor blinks immediately when enabled.
  Fix minehunt execution from QtDemo
  Update QtGui def files
  Ensure PathView updates positions when path changes.
  Create Loader components in correct context

11 years agoFix crash when using Q_GLOBAL_STATIC(QWidget...)
Jason Barron [Thu, 7 Oct 2010 13:52:27 +0000 (15:52 +0200)]
Fix crash when using Q_GLOBAL_STATIC(QWidget...)

If Q_GLOBAL_STATIC is used with a QWidget (or subclass) then the
destructor of QWidget will be executed after the destructor of
QApplication. Since ~QApplication() destroys the S60 environment and
the trap handler, we need to be sure that if QApplication is destroyed,
we do not attempt to use anything from the S60 environment. This
includes RWsSession and the trap handler.

The fix is to avoid flushing the WSERV buffer if QApplication has been
deleted already.

Reviewed-by: axis
11 years agoFix the icd auto config test after restructuring the icd plugin dependencies
Adrian Constantin [Tue, 5 Oct 2010 18:31:27 +0000 (21:31 +0300)]
Fix the icd auto config test after restructuring the icd plugin dependencies

* Remove the auto config tests related to libicd-network-wlan-dev
* Add test for the icd backend
* Add test for connsettings

See also f532d8fcd236be9933e4186a95561e1c264de277.

Reviewed-by: Aaron McCarthy
11 years agoRemoved the need for S60main.rsc resource file in Symbian.
Janne Anttila [Thu, 7 Oct 2010 09:41:03 +0000 (12:41 +0300)]
Removed the need for S60main.rsc resource file in Symbian.

Qt upgrade was failing since the s60main.rsc is being locked by
S60 application framework. And when installer detects that
old version of Qt has already been installed it first tries to
uninstall the old one and then install the new one. The uninstallion
failed since the file was locked by the running Qt application.

It should be noted that this patch fixes the Qt upgradibility only
for Qt versions where patch is included. I.e. the versions before
4.7.2 need a different mechanism to be upgradable. This different
mechanism is based on partial upgrade SIS packages as described in
QT-4052.

Task-number: QT-3471
Reviewed-by: Axis
11 years agoRevert the integration of the merge request 2286.
Benjamin Poulain [Thu, 7 Oct 2010 12:16:50 +0000 (14:16 +0200)]
Revert the integration of the merge request 2286.

The merge request 2286 will be integrated in master.

This should let an angry developer calm down and
resume his work.

11 years agoMerge branch 4.6 into qt-4.7-from-4.6
Qt Continuous Integration System [Thu, 7 Oct 2010 12:15:58 +0000 (14:15 +0200)]
Merge branch 4.6 into qt-4.7-from-4.6

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 7 Oct 2010 11:19:56 +0000 (13:19 +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:
  Minor OpenVG optimization when setting the EGL surface attribute.
  Make sure the QS60PaintEngine can draw other classes of pixmap data

11 years agoFix text rendering in GL when using the broken-fbo-fallback
Eskil Abrahamsen Blomfeldt [Thu, 7 Oct 2010 10:51:43 +0000 (12:51 +0200)]
Fix text rendering in GL when using the broken-fbo-fallback

This is a backport of 3874cd95e203da40d5205ef6455d7f56cba6923a which
was committed to qt:master. Since the patch that originally exposed
the bug was added to 4.7.2, this patch is required there as well.
Bug is visible when resizing the glyph cache on devices where
QGLContext::brokenFBOReadback defaults to true, or by setting this to
true on desktop.

Reviewed-by: Gunnar
11 years agoEnsure that actions are still fired even if there is no visible window
Andy Shaw [Thu, 7 Oct 2010 10:36:30 +0000 (12:36 +0200)]
Ensure that actions are still fired even if there is no visible window

On Mac, if there is no visible window then actions can still be fired
from the menubar as the menubar can still be accessed and used.  This
ensures that the actions are still triggered in this circumstance.

Task-number: QTBUG-13941
Reviewed-by: Richard Moe Gustavsen
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Thu, 7 Oct 2010 10:29:22 +0000 (12:29 +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: (22 commits)
  ActiveQt: also make the designer plugin for qaxwidget build in the opensource versions
  Fix compilation
  Code cleaning with the merge request 2286
  Fix a pending issue with the merge request 2286
  Doc: fix description of the expected behavior for QGraphicsItem::cursor
  Fixed the build error in qtconfig
  Resolved a little code style issue in qtconfig
  Renamed controls in qtconfig's MainWindow
  Removed inheritance from UI file in qtconfig's MainWindow
  Fixed a bug and resolved some translation issues in qtconfig
  Fixed some problems in qtconfig's PreviewWidget
  Removed the inheritance from ui file in qtconfig's PaletteEditorAdvanced
  Replaced the unnecessary include with declaration
  Resolved some code style issues and fixed the broken copyright year
  Finally removed the qtconfig dependency from qt3support
  Modified previewwidget's ui file in qtconfig
  Fixed some code style issues in qtconfig
  Refactored the MainWindow in qtconfig
  Refactored PaletteEditorAdvanced in qtconfig
  Removed more legacy code from qtconfig and fixed codestyle issues
  ...

11 years agoSupport device orientation in harmattan
Martin Jones [Thu, 7 Oct 2010 09:05:27 +0000 (19:05 +1000)]
Support device orientation in harmattan

Task-number: QTBUG-14137
Reviewed-by: Aaron Kennedy
11 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Thu, 7 Oct 2010 08:48:32 +0000 (10:48 +0200)]
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 build with cups 1.5 snapshots

11 years agoFix build with cups 1.5 snapshots
Bernhard Rosenkraenzer [Thu, 7 Oct 2010 08:33:05 +0000 (10:33 +0200)]
Fix build with cups 1.5 snapshots

Without this patch, Qt CUPS support fails to build with current
CUPS snapshots:

In file included from ../../include/QtGui/private/qcups_p.h:1:0,
                 from painting/qpdf.cpp:47:
.../qcups_p.h:78:11: error: 'ppd_file_t' does not name a type
.../qcups_p.h:80:11: error: 'ppd_file_t' does not name a type
.../qcups_p.h:81:11: error: 'ppd_option_t' does not name a type
.../qcups_p.h:84:11: error: 'ppd_option_t' does not name a type
.../qcups_p.h:87:34: error: ISO C++ forbids declaration of 'type
                            name' with no type
.../qcups_p.h:87:47: error: template argument 1 is invalid
.../qcups_p.h:103:56: error: 'ppd_group_t' does not name a type
.../qcups_p.h:103:77: error: ISO C++ forbids declaration of 'group'
                      with no type
.../qcups_p.h:104:62: error: 'ppd_group_t' does not name a type
.../qcups_p.h:104:75: error: ISO C++ forbids declaration of 'group'
                      with no type
.../qcups_p.h:108:11: error: 'ppd_option_t' does not name a type
.../qcups_p.h:110:5: error: 'ppd_file_t' does not name a type

Merge-request: 835
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
11 years agoActiveQt: also make the designer plugin for qaxwidget build in the opensource versions
Patrick Spendrin [Wed, 6 Oct 2010 11:18:59 +0000 (13:18 +0200)]
ActiveQt: also make the designer plugin for qaxwidget build in the opensource versions

Reviewed-by: Olivier Goffart
Merge-Request: 843

11 years agoFix compilation
Olivier Goffart [Thu, 7 Oct 2010 08:26:25 +0000 (10:26 +0200)]
Fix compilation

after merge request 2286

11 years agoConnect property alias change signals on use
Aaron Kennedy [Thu, 7 Oct 2010 07:42:08 +0000 (17:42 +1000)]
Connect property alias change signals on use

Task-number: QTBUG-14089

11 years agoMinor OpenVG optimization when setting the EGL surface attribute.
Jason Barron [Mon, 27 Sep 2010 08:54:38 +0000 (10:54 +0200)]
Minor OpenVG optimization when setting the EGL surface attribute.

Calling eglGetError() is expensive so we should avoid doing it unless
we know there actually is an error. The function returns EGL_FALSE upon
error so we can test for that instead of using eglGetError().

Reviewed-by: Jani Hautakangas
11 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 Oct 2010 07:08:51 +0000 (09:08 +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: (36 commits)
  Fix failure on Windows after commit ccd3f66
  tst_qtcpserver: Another attempt to reproduce QTBUG-14268
  Fix crash when constructing QThreadStorage after global destructors have run
  tst_qtcpsocket: Attempt to reproduce QTBUG-14268
  Fixed a buffer overrun when pasting large data from non-Qt apps
  Fix copying large data to non-Qt applications
  fix regexp in "make custom command handling in vc(x)proj files sane"
  qmake: Include -pthread when reducing duplicate library arguments
  qmake: Ensure right library order when reducing duplicate libraries
  rebuild configure.exe
  make QMAKE_POST_LINK handling in nmake generator sane
  make custom command handling in vc(x)proj files sane
  Revert "QWorkspace: fix hardcoded min size overwriting the real min size"
  QtScript/JavaScriptCore: Backport random number generator seeding fix
  Fix performance regression in QUuid::createUuid()
  Update japanese translations.
  Ensure that the underline is only drawn when expected for an accel
  Small improvement in the textedit demo
  My changes for 4.7.1
  QWorkspace: fix hardcoded min size overwriting the real min size
  ...

11 years agoMake sure the QS60PaintEngine can draw other classes of pixmap data
Jason Barron [Fri, 24 Sep 2010 14:47:41 +0000 (16:47 +0200)]
Make sure the QS60PaintEngine can draw other classes of pixmap data

The QS60PaintEngine should not assume that the pixmap is always of type
'Raster'. It should check the classId and if it is not 'Raster' it
should forward the call to QRasterPaintEngine which already handles
this scenario by converting the pixmap to a QImage and drawing that
instead.

Reviewed-by: Jani Hautakangas
11 years agoFix failure on Windows after commit ccd3f66
Bradley T. Hughes [Thu, 7 Oct 2010 06:49:30 +0000 (08:49 +0200)]
Fix failure on Windows after commit ccd3f66

By default the builds are placed in either a release\ or debug\
directory, so we need to start the correct one on Windows.

Reviewed-by: trustme
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 7 Oct 2010 04:36:09 +0000 (06:36 +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 fix.
  Fix setting PathView offset when all visible items are removed.
  Rename toolbar button.
  Update import statement.
  Fixes assert in QDeclarativeWebView
  Do not show 'More' button when in fullscreen view.
  Set reasonable QT_GUI_DRAG_DISTANCE in mkspecs/linux-g++-maemo/qplatformdefs.h
  Allow default QApplication::startDragDistance() to be defined in platformdefs.h
  Autotest
  Ensure the TextInput cursor blinks immediately when enabled.
  Fix minehunt execution from QtDemo
  Update QtGui def files
  Ensure PathView updates positions when path changes.
  Create Loader components in correct context

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 7 Oct 2010 01:26:46 +0000 (03:26 +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:
  Define QVG_SCISSOR_CLIP for QtOpenVG on Symbian.
  Remove unused/incorrect TFX commands pertaining to layers on Symbian.
  QS60Style: Highlighted TreeBranch indicator is incorrect

11 years agoDoc fix.
Michael Brasser [Thu, 7 Oct 2010 00:50:54 +0000 (10:50 +1000)]
Doc fix.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Martin Jones [Thu, 7 Oct 2010 00:41:23 +0000 (10:41 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

11 years agoFix setting PathView offset when all visible items are removed.
Martin Jones [Thu, 7 Oct 2010 00:37:50 +0000 (10:37 +1000)]
Fix setting PathView offset when all visible items are removed.
If we remove all items then we don't have a valid firstIndex with
which to anchor item positions, so just use offset.

Task-number: QTBUG-14199
Reviewed-by: Michael Brasser
11 years agoRename toolbar button.
Yann Bodson [Wed, 6 Oct 2010 23:39:28 +0000 (09:39 +1000)]
Rename toolbar button.

Task-number: QT-3637

11 years agoUpdate import statement.
Michael Brasser [Wed, 6 Oct 2010 22:30:18 +0000 (08:30 +1000)]
Update import statement.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Wed, 6 Oct 2010 17:40:24 +0000 (19:40 +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:
  Fixes assert in QDeclarativeWebView
  Do not show 'More' button when in fullscreen view.
  Set reasonable QT_GUI_DRAG_DISTANCE in mkspecs/linux-g++-maemo/qplatformdefs.h
  Allow default QApplication::startDragDistance() to be defined in platformdefs.h
  Autotest
  Ensure the TextInput cursor blinks immediately when enabled.
  Fix minehunt execution from QtDemo
  Update QtGui def files
  Ensure PathView updates positions when path changes.
  Create Loader components in correct context

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Benjamin Poulain [Wed, 6 Oct 2010 15:03:04 +0000 (17:03 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7

11 years agoCode cleaning with the merge request 2286
Benjamin Poulain [Wed, 6 Oct 2010 15:01:14 +0000 (17:01 +0200)]
Code cleaning with the merge request 2286

The merge request 2286 changes a lot of the QtConfig tool. I took
this opportunity to clean some old style mistake.

11 years agoFix a pending issue with the merge request 2286
Benjamin Poulain [Wed, 6 Oct 2010 14:46:43 +0000 (16:46 +0200)]
Fix a pending issue with the merge request 2286

A merge conflict was forgoten in the last update. This patch fixes that.

11 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 Oct 2010 14:33:30 +0000 (16:33 +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:
  Define QVG_SCISSOR_CLIP for QtOpenVG on Symbian.
  Remove unused/incorrect TFX commands pertaining to layers on Symbian.
  QS60Style: Highlighted TreeBranch indicator is incorrect

11 years agoDoc: fix description of the expected behavior for QGraphicsItem::cursor
Pierre Rossi [Wed, 6 Oct 2010 13:46:33 +0000 (15:46 +0200)]
Doc: fix description of the expected behavior for QGraphicsItem::cursor

It was fixed for setCursor in 600ff0193c9bfac4d2b40960766002e8b81aca22.

Reviewed-by: Alexis
11 years agoFixed the build error in qtconfig
Boris Moiseev [Wed, 6 Oct 2010 13:51:43 +0000 (15:51 +0200)]
Fixed the build error in qtconfig

qtconfig failed to build with Phonon gstreamer backend turned on

Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
11 years agoResolved a little code style issue in qtconfig
Boris Moiseev [Wed, 6 Oct 2010 13:51:42 +0000 (15:51 +0200)]
Resolved a little code style issue in qtconfig

Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
11 years agoRenamed controls in qtconfig's MainWindow
Boris Moiseev [Wed, 6 Oct 2010 13:51:41 +0000 (15:51 +0200)]
Renamed controls in qtconfig's MainWindow

All the controls are ensured to be named according to a Qt Coding Style.
The code is much more readable now. Also, the html code inserts and
tab stops in UI was fixed.

Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
11 years agoRemoved inheritance from UI file in qtconfig's MainWindow
Boris [Wed, 6 Oct 2010 13:51:40 +0000 (15:51 +0200)]
Removed inheritance from UI file in qtconfig's MainWindow

Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
11 years agoFixed a bug and resolved some translation issues in qtconfig
Boris Moiseev [Wed, 6 Oct 2010 13:51:39 +0000 (15:51 +0200)]
Fixed a bug and resolved some translation issues in qtconfig

Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
11 years agoFixed some problems in qtconfig's PreviewWidget
Boris Moiseev [Wed, 6 Oct 2010 13:51:39 +0000 (15:51 +0200)]
Fixed some problems in qtconfig's PreviewWidget

One problem was introduced by the convertion of widget from Qt3:
there is no such field as "text" in QTextEdit.

Also, widget now is not direct ancestor of UI file.

Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
11 years agoRemoved the inheritance from ui file in qtconfig's PaletteEditorAdvanced
Boris Moiseev [Wed, 6 Oct 2010 13:51:38 +0000 (15:51 +0200)]
Removed the inheritance from ui file in qtconfig's PaletteEditorAdvanced

Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
11 years agoReplaced the unnecessary include with declaration
Boris Moiseev [Wed, 6 Oct 2010 13:51:37 +0000 (15:51 +0200)]
Replaced the unnecessary include with declaration

Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
11 years agoResolved some code style issues and fixed the broken copyright year
Boris Moiseev [Wed, 6 Oct 2010 13:51:36 +0000 (15:51 +0200)]
Resolved some code style issues and fixed the broken copyright year

Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
11 years agoFinally removed the qtconfig dependency from qt3support
Boris Moiseev [Wed, 6 Oct 2010 13:51:35 +0000 (15:51 +0200)]
Finally removed the qtconfig dependency from qt3support

Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
11 years agoModified previewwidget's ui file in qtconfig
Boris Moiseev [Wed, 6 Oct 2010 13:51:34 +0000 (15:51 +0200)]
Modified previewwidget's ui file in qtconfig

The modification is needed to prevent ui compilation time warnings.

Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
11 years agoFixed some code style issues in qtconfig
Boris Moiseev [Wed, 6 Oct 2010 13:51:34 +0000 (15:51 +0200)]
Fixed some code style issues in qtconfig

Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
11 years agoRefactored the MainWindow in qtconfig
Boris Moiseev [Wed, 6 Oct 2010 13:51:33 +0000 (15:51 +0200)]
Refactored the MainWindow in qtconfig

qtconfig can now be fully build without qt3support module. Removed
some legacy and unused code, changed one of labels on widget to reflect
the real meaning of configuration parameter.

Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
11 years agoRefactored PaletteEditorAdvanced in qtconfig
Boris Moiseev [Wed, 6 Oct 2010 13:51:32 +0000 (15:51 +0200)]
Refactored PaletteEditorAdvanced in qtconfig

The widget was redrawn and now makes use of QDialogButtonBox. The
ColorButton's are created more correctly for now. Also, all of the Qt4
ColorRoles are now supported.

All the legacy code was dropped so it must not depend of qt3support.
Some refactoring job also was done and much of unused code was removed.

Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
11 years agoRemoved more legacy code from qtconfig and fixed codestyle issues
Boris Moiseev [Wed, 6 Oct 2010 13:51:31 +0000 (15:51 +0200)]
Removed more legacy code from qtconfig and fixed codestyle issues

Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
11 years agoRefactored PreviewWidget in qtconfig
Boris Moiseev [Wed, 6 Oct 2010 13:51:30 +0000 (15:51 +0200)]
Refactored PreviewWidget in qtconfig

Removed the legacy code and behavior. Now this part of qtconfig doesn't
need the qt3support module to be built.

Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
11 years agoQGraphicsItem device coordinate cache unefficient in portrait mode
Bjørn Erik Nilsen [Wed, 6 Oct 2010 12:19:44 +0000 (14:19 +0200)]
QGraphicsItem device coordinate cache unefficient in portrait mode

Problem was that we always invalidated the cache whenever the item was
rotated. This is however not required for simple rotations such as
90, 180 and 270 degrees. This commit also removes the somewhat arbitrary
logic which takes the desktop size into account. We now use the viewport
size instead.

Auto test included.

Task-number: QT-3779
Reviewed-by: yoann
11 years agotst_qtcpserver: Another attempt to reproduce QTBUG-14268
Markus Goetz [Wed, 6 Oct 2010 11:46:15 +0000 (13:46 +0200)]
tst_qtcpserver: Another attempt to reproduce QTBUG-14268

The test (un)fortunately passes :-)

Task-number: QTBUG-14268

11 years agoFix crash when constructing QThreadStorage after global destructors have run
Bradley T. Hughes [Wed, 6 Oct 2010 08:31:06 +0000 (10:31 +0200)]
Fix crash when constructing QThreadStorage after global destructors have run

In this particular case, the destructors vector used by
QThreadStorageData has already been destroyed, yet a new QThreadStorage
is being allocated. This can only happen during global destruction, at
which point we assume that there is only one thread. In order to keep
QThreadStorage working, we need somewhere to store the data, and the
best place we have in this situation is at the tail of the current
thread's tls vector. The destructor is ignored, since we have no where
to store it, and no way to actually call it.

Task-number: QTBUG-10084
Reviewed-by: thiago
Reviewed-by: olivier
11 years agotst_qtcpsocket: Attempt to reproduce QTBUG-14268
Markus Goetz [Wed, 6 Oct 2010 10:46:45 +0000 (12:46 +0200)]
tst_qtcpsocket: Attempt to reproduce QTBUG-14268

The test (un)fortunately passes :-)

Task-number: QTBUG-14268

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Wed, 6 Oct 2010 10:31:01 +0000 (12:31 +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: (32 commits)
  Fixed a buffer overrun when pasting large data from non-Qt apps
  Fix copying large data to non-Qt applications
  fix regexp in "make custom command handling in vc(x)proj files sane"
  qmake: Include -pthread when reducing duplicate library arguments
  qmake: Ensure right library order when reducing duplicate libraries
  rebuild configure.exe
  make QMAKE_POST_LINK handling in nmake generator sane
  make custom command handling in vc(x)proj files sane
  Revert "QWorkspace: fix hardcoded min size overwriting the real min size"
  QtScript/JavaScriptCore: Backport random number generator seeding fix
  Fix performance regression in QUuid::createUuid()
  Update japanese translations.
  Ensure that the underline is only drawn when expected for an accel
  Small improvement in the textedit demo
  My changes for 4.7.1
  QWorkspace: fix hardcoded min size overwriting the real min size
  Doc: Fixing link titles and error color in search results
  Doc: Implementing features to the search feature.
  Setting the _NET_WM_STATE Atom only when its not already set
  Fix focus appearance of tabwidget tabs with QGtkStyle
  ...

11 years agoFixed a buffer overrun when pasting large data from non-Qt apps
Denis Dzyubenko [Wed, 6 Oct 2010 08:31:37 +0000 (10:31 +0200)]
Fixed a buffer overrun when pasting large data from non-Qt apps

When we receive a COMPOUND_TEXT data and convert it to multi-byte, if
the new length is less than the original buffer, we resize the buffer,
but then we need to make sure we reset the buffer_offset variable,
which is returned as a "size" of the buffer to a caller.

The conversion to COMPOUND_TEXT format was totally wrong, we were using
the wrong length of the input text, so the converted string was
truncated.

Task-number: QTBUG-8644
Reviewed-by: Bradley T. Hughes
11 years agoFix copying large data to non-Qt applications
Denis Dzyubenko [Tue, 5 Oct 2010 15:39:57 +0000 (17:39 +0200)]
Fix copying large data to non-Qt applications

In send_selection when we decide to use INCR properties we set the
given property value to be INCR atom, however we were also sending
SelectionNotify event containing the name of the property that the
client should watch as INCR, which is wrong, we should send the
original property that we were asked to use instead.

This fixes copying large junks of data from Qt application, for
example copying text (>200k) to gedit or images to gimp.

Task-number: QTBUG-8644
Reviewed-by: Bradley T. Hughes
11 years agoFixes assert in QDeclarativeWebView
Thomas Hartmann [Wed, 6 Oct 2010 09:48:24 +0000 (11:48 +0200)]
Fixes assert in QDeclarativeWebView

If QDeclarativeWebView was instantiated twice
an assert was triggered by QWebSettings::enablePersistentStorage();

This patch is crtical for tooling (Bauhaus)

Task-number: QTBUG-14278
Reviewed-by: Aaron Kennedy
11 years agoDo not show 'More' button when in fullscreen view.
Yann Bodson [Wed, 6 Oct 2010 08:52:44 +0000 (18:52 +1000)]
Do not show 'More' button when in fullscreen view.

Task-number: QTBUG-11813

11 years agofix regexp in "make custom command handling in vc(x)proj files sane"
Oswald Buddenhagen [Wed, 6 Oct 2010 08:29:55 +0000 (10:29 +0200)]
fix regexp in "make custom command handling in vc(x)proj files sane"

11 years agoDefine QVG_SCISSOR_CLIP for QtOpenVG on Symbian.
Jason Barron [Wed, 6 Oct 2010 08:14:21 +0000 (10:14 +0200)]
Define QVG_SCISSOR_CLIP for QtOpenVG on Symbian.

I avoided adding this flag for ages since I wasn't convinced that it
was needed on all Symbian OpenVG hardware, but not having it has caused
more problems since people report problems when it is not enabled.

Simple solution is just to add it.

Task-number: QTBUG-11311
Reviewed-by: Jani Hautakangas
11 years agoRemove unused/incorrect TFX commands pertaining to layers on Symbian.
Jason Barron [Wed, 6 Oct 2010 07:54:15 +0000 (09:54 +0200)]
Remove unused/incorrect TFX commands pertaining to layers on Symbian.

These commands have been renamed in the Symbian^4 code line, but since
they are not currently used by the effects engine, we simply remove
them for now to avoid causing build breakages on platforms that use the
older version.

Reviewed-by: Jani Hautakangas
11 years agoSet reasonable QT_GUI_DRAG_DISTANCE in mkspecs/linux-g++-maemo/qplatformdefs.h
Martin Jones [Wed, 6 Oct 2010 07:55:15 +0000 (17:55 +1000)]
Set reasonable QT_GUI_DRAG_DISTANCE in mkspecs/linux-g++-maemo/qplatformdefs.h

Task-number: QT-3930

11 years agoAllow default QApplication::startDragDistance() to be defined in platformdefs.h
Martin Jones [Wed, 6 Oct 2010 07:43:22 +0000 (17:43 +1000)]
Allow default QApplication::startDragDistance() to be defined in platformdefs.h

Task-number: QT-3930
Reviewed-by: Joona Petrell
11 years agoMerge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Sami Merila [Wed, 6 Oct 2010 07:06:54 +0000 (10:06 +0300)]
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7

11 years agoQS60Style: Highlighted TreeBranch indicator is incorrect
Sami Merila [Wed, 6 Oct 2010 07:02:45 +0000 (10:02 +0300)]
QS60Style: Highlighted TreeBranch indicator is incorrect

Part of the fix for QTBUG-13553 incorrectly uses commonstyle to draw branch
highlight, when it should use QS60Style.

As a fix, commonstyle should not be used unless theme palette has been
tempered with.

Task-number: QTBUG-13699
Reviewed-by: Miikka Heikkinen
11 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 Oct 2010 06:38:58 +0000 (08:38 +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:
  Adding a threshold for partial updates.
  Fixed arm X11 build.

11 years agoAutotest
Aaron Kennedy [Wed, 6 Oct 2010 05:38:39 +0000 (15:38 +1000)]
Autotest

Task-number: QTBUG-14089

11 years agoEnsure the TextInput cursor blinks immediately when enabled.
Michael Brasser [Wed, 6 Oct 2010 05:12:46 +0000 (15:12 +1000)]
Ensure the TextInput cursor blinks immediately when enabled.

Previously we relied on cursorPosChanged being called to do the update,
but that isn't called in all circumstances. Now we explicitly update
when the cursor is enabled or disabled.

Task-number: QTBUG-13993

11 years agoFix minehunt execution from QtDemo
Joona Petrell [Wed, 6 Oct 2010 04:01:56 +0000 (14:01 +1000)]
Fix minehunt execution from QtDemo

Task-number: QTBUG-14250
Reviewed-by: Martin Jones
11 years agoUpdate QtGui def files
Joona Petrell [Wed, 6 Oct 2010 02:41:16 +0000 (12:41 +1000)]
Update QtGui def files

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Wed, 6 Oct 2010 04:24:55 +0000 (06:24 +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:
  Ensure PathView updates positions when path changes.
  Create Loader components in correct context

11 years agoEnsure PathView updates positions when path changes.
Michael Brasser [Wed, 6 Oct 2010 03:59:19 +0000 (13:59 +1000)]
Ensure PathView updates positions when path changes.

Fixes regression caused by optimization added in commit
35a51442ed21f58c06b21293eeb56e843251ee82.

Task-number: QTBUG-14239
Reviewed-by: Martin Jones
11 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 Oct 2010 01:58:55 +0000 (03:58 +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:
  QS60Style: QDateEdit - Layout issues
  Quick fix for OSX and Windows/Mingw compilation errors.
  Fix gcc compilation problems in QtOpenGL. Actually was typo and
  Revert "When using complex transformations rendering goes easily off by one pixel."
  fix for USER: 163 panic found on 5800XM
  Fixed library ordering when linking to qtmain.
  Made javascriptcore depend on corelib.
  Enable QtOpenGL vector path caching on Symbian/IVE3
  Made scripttools disabled on Symbian by default, like on Windows.
  Got rid of "No such directory" warning when shadow building.
  Added qmake check for presence of RHttpDownloadMgr header
  Fixed crash on startup in Symbian debug build
  fixed hybrid heap Symbian udeb build issues
  qmediaplayer: show buffer status of 0%
  Progressive download in Phonon MMF backend: integrated with player
  Progressive download in Phonon MMF backend: added download managers
  Remove partial upgrade deployment generation for Webkit

11 years agoCreate Loader components in correct context
Aaron Kennedy [Wed, 6 Oct 2010 01:26:23 +0000 (11:26 +1000)]
Create Loader components in correct context

Task-number: QTBUG-13481

11 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 Oct 2010 00:35:49 +0000 (02:35 +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:
  QS60Style: QDateEdit - Layout issues
  Quick fix for OSX and Windows/Mingw compilation errors.
  Fix gcc compilation problems in QtOpenGL. Actually was typo and
  Revert "When using complex transformations rendering goes easily off by one pixel."
  fix for USER: 163 panic found on 5800XM
  Fixed library ordering when linking to qtmain.
  Made javascriptcore depend on corelib.
  Enable QtOpenGL vector path caching on Symbian/IVE3
  Made scripttools disabled on Symbian by default, like on Windows.
  Got rid of "No such directory" warning when shadow building.
  Added qmake check for presence of RHttpDownloadMgr header
  Fixed crash on startup in Symbian debug build
  fixed hybrid heap Symbian udeb build issues
  qmediaplayer: show buffer status of 0%
  Progressive download in Phonon MMF backend: integrated with player
  Progressive download in Phonon MMF backend: added download managers
  Remove partial upgrade deployment generation for Webkit