8 years agofix qm generation under windows v4.6.1
Oswald Buddenhagen [Thu, 14 Jan 2010 15:46:57 +0000 (16:46 +0100)]
fix qm generation under windows

Reviewed-by: Daniel Molkentin
(cherry picked from commit e4953b7262d8122747569efee194b6eb46d40749)

8 years agoMore changelog additions for QtWebKit
Jason McDonald [Thu, 14 Jan 2010 17:30:51 +0000 (03:30 +1000)]
More changelog additions for QtWebKit

Reviewed-by: Trust me
(cherry picked from commit 59ee1b9d387468a5a80b5c450aa202d1b33e6bd1)



8 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8f6992...
Simon Hausmann [Thu, 14 Jan 2010 12:14:12 +0000 (13:14 +0100)]
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8f6992f4e8f027818429d428393b08068eca9ffa )

Changes in WebKit/qt since the last update:

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

        Reviewed by Kenneth Rohde Christiansen.

        [Qt] Update Symbian .def symbol export files after private API additions.

        * symbian/bwins/QtWebKitu.def:
        * symbian/eabi/QtWebKitu.def:
(cherry picked from commit f894fb8228e35a43b2baf80666ca5bca6e987064)

8 years agofixes MMF plugin for Phonon when buidling with WINSCW
Espen Riskedal [Thu, 14 Jan 2010 16:51:10 +0000 (17:51 +0100)]
fixes MMF plugin for Phonon when buidling with WINSCW

syncqt was changed, so include paths got messed up because of the
relative path bug when building for WINSCW. We simply now make sure
to include as <Phonon/foobar.h> instead of <phonon/FooBar> to fix

Reviewed-by: Aleksandar Sasha Babic
8 years agoUpdate my changelog for 4.6.1
Thiago Macieira [Wed, 13 Jan 2010 11:39:16 +0000 (12:39 +0100)]
Update my changelog for 4.6.1
(cherry picked from commit 8c7e85c7b9933949c7a7c05489f5f6bfd1ce4312)

8 years agoMy changes for 4.6.1
Jason McDonald [Thu, 14 Jan 2010 10:54:07 +0000 (20:54 +1000)]
My changes for 4.6.1

(cherry picked from commit 42fc59ed04e1675ecae7fa87303a148c4b0c1ed1)



8 years agodoc: Corrected parameter value in snippet.
Martin Smith [Thu, 7 Jan 2010 12:51:56 +0000 (13:51 +0100)]
doc: Corrected parameter value in snippet.

Task-number:    QTBUG-7158
(cherry picked from commit 52ecb299691defc3be6d202c7fab71bf865c710a)

8 years agodoc: This bug wasn't really a bug; it just required clarification.
Martin Smith [Wed, 13 Jan 2010 12:13:07 +0000 (13:13 +0100)]
doc: This bug wasn't really a bug; it just required clarification.

The reported bug was actually not a bug. It is ok to pass the enum
value as a string here, because the enumeration type has been
registered with the meta-object system with the Q_ENUMS()
macro. However, I have added a bit of text to clarify things a bit.

Task-number:    QTBUG-7158
(cherry picked from commit cd0772335cc9bcedd582cacc834bf4609ca650b0)

8 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8b9165...
Simon Hausmann [Wed, 13 Jan 2010 09:21:04 +0000 (10:21 +0100)]
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8b9165d3bc84d1c8cc7df49a191cc3857b5530d4 )

Changes in WebKit/qt since the last update:

* Cherry-pick of http://trac.webkit.org/changeset/53181
  ( http://bugreports.qt.nokia.com/browse/QTBUG-7290 )
(cherry picked from commit dd62687182830aa353ef573f653fe913fd42a8d0)

8 years agoPolish the changes file.
Jason McDonald [Wed, 13 Jan 2010 17:35:38 +0000 (03:35 +1000)]
Polish the changes file.

Reviewed-by: Trust Me
8 years agoCopy changes file from 4.6 branch.
Jason McDonald [Wed, 13 Jan 2010 17:11:39 +0000 (03:11 +1000)]
Copy changes file from 4.6 branch.

Reviewed-by: Trust Me
8 years agoMerge branch '4.6.1' of git@scm.dev.nokia.troll.no:qt/qt-releases into 4.6.1
Jason McDonald [Wed, 13 Jan 2010 16:47:34 +0000 (02:47 +1000)]
Merge branch '4.6.1' of git@scm.dev.nokia.troll.no:qt/qt-releases into 4.6.1

8 years agoChanged log updated
Prasanth Ullattil [Tue, 12 Jan 2010 12:13:35 +0000 (13:13 +0100)]
Changed log updated
(cherry picked from commit c90c5b6124bb952500c1d3ca0114163729414771)

8 years agoUpdate change log with Yoann Lopes work.
Yoann Lopes [Tue, 12 Jan 2010 11:32:09 +0000 (12:32 +0100)]
Update change log with Yoann Lopes work.
(cherry picked from commit 81e1d9a9e9ff6649727bd26ea0c3be971813866d)

8 years agoUpdate changelog with some of my stuff
Markus Goetz [Tue, 12 Jan 2010 11:14:41 +0000 (12:14 +0100)]
Update changelog with some of my stuff
(cherry picked from commit d1f73b7be62b0f6e9294b5d78ccd0680cb9fe118)

8 years agofix sametext and number heuristics
Oswald Buddenhagen [Wed, 6 Jan 2010 11:34:12 +0000 (12:34 +0100)]
fix sametext and number heuristics

92e9a48 ("eliminate Translator::replace()") eliminated the correctness
as well. whoops.

this code should be more efficient as well ...
(cherry picked from commit 2bd2e35078e0cdf9f1458892adcd0939504b59bb)

8 years agomy 4.6.1 changelog contributions
Bradley T. Hughes [Tue, 12 Jan 2010 10:31:34 +0000 (11:31 +0100)]
my 4.6.1 changelog contributions
(cherry picked from commit eef74a19b867f307d7a0c0c47f3ee0ce2c4d283e)

8 years agoAdded changelog entries.
axis [Tue, 12 Jan 2010 08:20:02 +0000 (09:20 +0100)]
Added changelog entries.
(cherry picked from commit bb689ca42deee2034a3475fa0c5f9337ec1aebbb)

8 years agoUpdate changes file with Rhys Weatherley's work.
Rhys Weatherley [Mon, 11 Jan 2010 22:36:29 +0000 (08:36 +1000)]
Update changes file with Rhys Weatherley's work.
(cherry picked from commit 7abb2cfdea14fa71aabcd79635aa8f407ed96186)

8 years agoUpdate changes file
Alan Alpert [Fri, 8 Jan 2010 11:30:14 +0000 (12:30 +0100)]
Update changes file

Task-number: QTBUG-6580
(cherry picked from commit bdef1a949ea32c5fe0bd2926171b813cff0cee2a)

8 years agoFixes warning in the QMacStyle
Olivier Goffart [Mon, 11 Jan 2010 13:49:39 +0000 (14:49 +0100)]
Fixes warning in the QMacStyle

Warning such as
QFont::setPointSizeF: Point size <= 0 (-1.000000), must be greater than 0

because the font size might be specified in pixel, and pointSizeF
returns -1 if the font size is in pixel (as documented)

Reviewed-by: jbache
Task-number: QTBUG-7263
(cherry picked from commit a34d372b45d75a32dcc300dbb7f8151e15df4294)

8 years agofix release mode crash in qfont.cpp initFontSubst() on Windows mobile
Joerg Bornemann [Mon, 11 Jan 2010 16:48:23 +0000 (17:48 +0100)]
fix release mode crash in qfont.cpp initFontSubst() on Windows mobile

Since we've disabled LTCG for Windows CE by default, the code in
initFontSubst() crashes on Windows mobile.
Adding the extra const solves this problem.

Task-number: QTBUG-6641
Reviewed-by: ossi
(cherry picked from commit 8798b36880d1387d2d27f7fb35ccbf02af6232a0)

8 years agoAvoid coordinate limitations in the raster engine.
Gunnar Sletta [Tue, 12 Jan 2010 14:13:46 +0000 (15:13 +0100)]
Avoid coordinate limitations in the raster engine.

Lines that are longer than 2^15 will overflow in qgrayraster.c
so we need to clip them. Also, we need to clip the bounding
rectangle to avoid an endless clip-loop

Task: http://bugreports.qt.nokia.com/browse/QTBUG-6198
Reviewed-by: Samuel
(cherry picked from commit d4e81805ff47a266890f9638cf29647889d5c730)

8 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( bd6591...
Simon Hausmann [Tue, 12 Jan 2010 11:28:22 +0000 (12:28 +0100)]
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( bd6591b4acaf2172ab05702153ef539c0ac89cbb )

Changes in WebKit/qt since the last update:

++ b/WebKit/qt/ChangeLog
2009-12-18  Joe Ligman  <joseph.ligman@nokia.com>

        Reviewed by Kenneth Rohde Christiansen.

        [Qt] Add new API to QWebFrame to scrollRecursively starting with any css overflow
        then checking current frame and then ancestors

        * Api/qwebframe.cpp:
        * Api/qwebframe.h:
        * Api/qwebframe_p.h:
        * tests/qwebframe/qwebframe.qrc:
        * tests/qwebframe/testiframe.html: Added.
        * tests/qwebframe/testiframe2.html: Added.
        * tests/qwebframe/tst_qwebframe.cpp:
(cherry picked from commit 04bdf9f6a77e9ebf96431f89b8240a037b3d2b09)

8 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1...
Simon Hausmann [Thu, 7 Jan 2010 17:32:45 +0000 (18:32 +0100)]
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d )

Changes in WebKit/qt since the last update:

++ b/WebKit/qt/ChangeLog
2010-01-07  Yael Aharon  <yael.aharon@nokia.com>

        Reviewed by Kenneth Rohde Christiansen.

        [Qt] Allow the application to override online/offline network status

        Add a setting so that applications can overide the network status.
        Applications that use this setting still need to block network access
        through QNAM.

        * Api/qwebsettings.cpp:
(cherry picked from commit a010d26629e8aa5aaa14a7e57ace06708fc903d6)

8 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( b217cd...
Simon Hausmann [Thu, 7 Jan 2010 12:19:02 +0000 (13:19 +0100)]
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( b217cdfedc7b5e7581325bda718192247f03dd5d )

Changes in WebKit/qt since the last update:

++ b/WebKit/qt/ChangeLog
2010-01-07  Yongjun Zhang  <yongjun.zhang@nokia.com>, Laszlo Gombos  <laszlo.1.gombos@nokia.com>

        Reviewed by Simon Hausmann.

        [Qt] need an API to suspend and resume active Javascript DOM objects.

        Add suspend and resume DOM objects private API to QWebFrame.

        * Api/qwebframe.cpp:
(cherry picked from commit 0abf84be1a715db1d6adc5bf21e150e949e0e9e9)

8 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 865abd...
Simon Hausmann [Wed, 6 Jan 2010 11:19:34 +0000 (12:19 +0100)]
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 865abd2871c801c1d3d0f4eebd985b2daab89ebe )

Changes in WebKit/qt since the last update:
(cherry picked from commit 53817ebe67158d642fd5d85dfdcf4d96e91b093b)

8 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 5d691a...
Simon Hausmann [Tue, 5 Jan 2010 08:09:42 +0000 (09:09 +0100)]
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 5d691a1c283938dfbdf891883d8cff8a6ef040bf )

Changes in WebKit/qt since the last update:

* Prospective build fix for IA64

Task: QTBUG-6948
(cherry picked from commit dc50ba5885d27aff99d62ced52081eda851552e7)

8 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 70b598...
Simon Hausmann [Wed, 30 Dec 2009 13:03:51 +0000 (14:03 +0100)]
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 70b5989bdeea2f73bd950099fc0f0e954550ef54 )

Changes in WebKit/qt since the last update:

++ b/WebKit/qt/ChangeLog
2009-12-30  Janne Koskinen  <janne.p.koskinen@digia.com>

        Reviewed by Simon Hausmann.

        Upstream Symbian def files from Qt 4.6.

        These files define the ABI of QtWebKit on Symbian.

        * symbian/bwins/QtWebKitu.def: Added.
        * symbian/eabi/QtWebKitu.def: Added.
(cherry picked from commit 775339c85e5c28d7cef419c40969c69b133bd65c)

8 years agoSymbian build fix
Simon Hausmann [Wed, 30 Dec 2009 12:19:42 +0000 (13:19 +0100)]
Symbian build fix

Disable bearer management support in WebKit for builds inside Qt. We can't
depend on an external module that depends on what we're building right now :)

This is just a stop-gap fix.

Reviewed-by: Trust me
(cherry picked from commit 5ac2736a7733197bde86ea4fb873ba9b1038d444)

8 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( c07df5...
Simon Hausmann [Wed, 30 Dec 2009 09:48:14 +0000 (10:48 +0100)]
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( c07df5686b431aa5d11643d00308d8f8f59d88b1 )

Changes in WebKit/qt since the last update:

* Disable HTML5 Datagrid
* Fix RVCT build
(cherry picked from commit a8454801a1fc195d2ef6e1a05042ccf0833d8edd)

8 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( eb1c86...
Simon Hausmann [Tue, 29 Dec 2009 16:06:12 +0000 (17:06 +0100)]
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( eb1c86da9f5fa43a0e126ef58ab11cbd4d200af7 )

Changes in WebKit/qt since the last update:

++ b/WebKit/qt/ChangeLog
2009-12-14  Holger Hans Peter Freyther  <zecke@selfish.org>

        Reviewed by Kenneth Rohde Christiansen.

        [Qt] Fix JavaScript prompt behavior for empty/null strings.

        The patch is based on the work done by Gupta Manish.

        In the default implementation of the JavaScript prompt
        we are using a QInputDialog to get the text and this has
        one quirk with regard to not entering any text.

        In other WebKit ports and in Firefox an empty string is
        returned but in the Qt case it is a null string.

        Change the API documentation in QWebPage to mention we want to
        have a non null string but do the fixup in the ChromeClientQt
        to support existing code.

        * Api/qwebpage.cpp:
        (QWebPage::javaScriptPrompt): Change API documentation
        * WebCoreSupport/ChromeClientQt.cpp:
        (WebCore::ChromeClientQt::runJavaScriptPrompt): Fixup null QString
(cherry picked from commit 3185723b69133530016528c8cef57da247589d30)

8 years agoMerge branch '4.6.1' of git@scm.dev.nokia.troll.no:qt/qt-releases into 4.6.1
Jason McDonald [Wed, 13 Jan 2010 11:01:21 +0000 (21:01 +1000)]
Merge branch '4.6.1' of git@scm.dev.nokia.troll.no:qt/qt-releases into 4.6.1

8 years agoImprove QUrl constructing performance by making empty URLs have d==0.
Thiago Macieira [Thu, 7 Jan 2010 09:23:03 +0000 (10:23 +0100)]
Improve QUrl constructing performance by making empty URLs have d==0.

One major cost is that QUrl::d is never 0 (even for default
constructor). While this simplifies the code, it has a real
performance impact, since QUrlPrivate is quite expensive to create (14
QString/QByteArray members, plus others). In a simple test of the QML
flickr demo, 1 in 3 QUrlPrivate objects that were created were never
used before being deleted.

According to callgrind, this reduces cost of QUrl+QUrlPrivate by 25%
in the case tested.

Patch-by: Warwick Allison
Reviewed-by: Thiago Macieira
(cherry picked from commit 51f92c1a4f66f658b3c3b7f034bb8dd661a0d57d)

8 years agoMerge branch '4.6.1' of git@scm.dev.nokia.troll.no:qt/qt-releases into 4.6.1
Jesper Thomschutz [Wed, 13 Jan 2010 10:56:48 +0000 (11:56 +0100)]
Merge branch '4.6.1' of git@scm.dev.nokia.troll.no:qt/qt-releases into 4.6.1

8 years agodoc: Added clarification about allocating space for the 0 terminator.
Martin Smith [Mon, 11 Jan 2010 12:24:27 +0000 (13:24 +0100)]
doc: Added clarification about allocating space for the 0 terminator.

Task-number:    QTBUG-5121
(cherry picked from commit 51078f1ef008c8395ddb76ac2f444daa511a4507)

8 years agoFix for QTBUG-6408 QFontEngineS60::QFontEngineS60 called hundreds of
Jani Hautakangas [Mon, 11 Jan 2010 09:11:59 +0000 (11:11 +0200)]
Fix for QTBUG-6408 QFontEngineS60::QFontEngineS60 called hundreds of
times, taking up to 1ms each call.

Use S60->ScreenDevice() to get/release fonts instead of create a new
screen device each time.

Task-number: QTBUG-6408
Reviewed-by: Jason Barron
(cherry picked from commit d8ad9ac86dac9489b553e6416329308ae7d823d0)

8 years agoDoc: Added license information for the Symbian version of qtmain.
David Boddie [Thu, 7 Jan 2010 17:12:17 +0000 (18:12 +0100)]
Doc: Added license information for the Symbian version of qtmain.

Reviewed-by: Trust Me
Discussed-with: Legal and axis
(cherry picked from commit 0d97775f7a1077862281e3858da6b2c899ea8790)

8 years agoFixes a crash when destroying and creating QApplication.
Denis Dzyubenko [Wed, 6 Jan 2010 17:16:27 +0000 (18:16 +0100)]
Fixes a crash when destroying and creating QApplication.

Moved the gestureManager pointer to a QApplicationPrivate to make sure if
QApplication object is destroyed, QGestureManager pointer is set to zero.

Task-number: QTBUG-7029
Reviewed-by: Thiago
(cherry picked from commit 828b1299e1ecb2da23799a2e49370e00dcf9c126)

8 years agodoc: Fixed typos.
Martin Smith [Fri, 8 Jan 2010 11:58:18 +0000 (12:58 +0100)]
doc: Fixed typos.

Task-number:    QTBUG-6607
(cherry picked from commit 8894467656973bd311bcc5822a38bdd0e171da51)

8 years agodoc: Explained parameter value defaults where appropriate.
Martin Smith [Fri, 8 Jan 2010 11:47:14 +0000 (12:47 +0100)]
doc: Explained parameter value defaults where appropriate.

Task-number:    QTBUG-6607
(cherry picked from commit 3aa77d64608f944592939c5d673f1b7dabec730f)

8 years agodoc: Removed incorrect \inmodule command.
Martin Smith [Thu, 7 Jan 2010 13:25:13 +0000 (14:25 +0100)]
doc: Removed incorrect \inmodule command.

Task-number:    QTBUG-6606
(cherry picked from commit 86bb9a9f8b2a455d4f3f8f58bb1a0f751d68df35)

8 years agodoc: Clarified activeSubControls and subControls.
Martin Smith [Wed, 6 Jan 2010 13:57:15 +0000 (14:57 +0100)]
doc: Clarified activeSubControls and subControls.

Task-number:    QTBUG-6405
(cherry picked from commit e2734782e72fccbc3bf528f201bac50703718b54)

8 years agodoc: Clarified that .lnk files are System files on Windows.
Martin Smith [Wed, 6 Jan 2010 13:33:01 +0000 (14:33 +0100)]
doc: Clarified that .lnk files are System files on Windows.

Task-number:    QTBUG-6615
(cherry picked from commit 73b7ff354f9eaf5819847dac0c147351c80d8a9b)

8 years agodoc: Updated the descriptions of the connection types.
Martin Smith [Tue, 12 Jan 2010 12:09:31 +0000 (13:09 +0100)]
doc: Updated the descriptions of the connection types.

Replaced the ambiguous "delivered" with the explanation that the
blocking queued connection type blocks the emitter's thread until
the slot finishes executing in the receiver's thread.

Task-number:    QTBUG-6392
(cherry picked from commit 4da15757269feb872432c43a3516a1349d6dcf39)

8 years agoUse the lowercase/shortname.h headers for Phonon includes
Thiago Macieira [Wed, 6 Jan 2010 13:18:39 +0000 (14:18 +0100)]
Use the lowercase/shortname.h headers for Phonon includes

Task-number: QTBUG-4685
Reviewed-by: TrustMe
(cherry picked from commit bd01114b3fcf2cc702fdd9e303a15bcc900cfe95)

8 years agoRemove special Phonon processing from syncqt.
Thiago Macieira [Wed, 6 Jan 2010 11:32:25 +0000 (12:32 +0100)]
Remove special Phonon processing from syncqt.

Restore original Qt 4.4 behaviour. The capital P headers are not
correct because of frameworks on Mac.

More info, see thread:

Task-number: QTBUG-4685
Reviewed-by: Trust Me
(cherry picked from commit 72adb8f5710fea385e94f9726546397cfbb1e4ad)

8 years agoAdded absolute path to sqlite3.sis in s60installs.pro
Miikka Heikkinen [Tue, 12 Jan 2010 10:29:35 +0000 (12:29 +0200)]
Added absolute path to sqlite3.sis in s60installs.pro

Relative path was only working when package was created from
s60installs directory. Binary installer creation requires package
creation to work also from Qt root, so added absolute path to

Task-number: QTBUG-7275
Reviewed-by: Janne Anttila
(cherry picked from commit 008bae01b016926209dddacc6e31c79b9d99d4f7)

8 years agodoc: Corrected explanation of when append() does nothing.
Martin Smith [Mon, 11 Jan 2010 12:43:31 +0000 (13:43 +0100)]
doc: Corrected explanation of when append() does nothing.

Task-number:    QTBUG-7246
(cherry picked from commit 8e2c575f6383a69e9c1d4f069e3c8e3b219197b5)

8 years agodoc: Corrected parameter value in snippet.
Martin Smith [Thu, 7 Jan 2010 12:51:56 +0000 (13:51 +0100)]
doc: Corrected parameter value in snippet.

Task-number:    QTBUG-7158
(cherry picked from commit 52ecb299691defc3be6d202c7fab71bf865c710a)

8 years agodoc: Added enum values to table for Qt 4.5 and 4.6.
Martin Smith [Thu, 7 Jan 2010 11:23:01 +0000 (12:23 +0100)]
doc: Added enum values to table for Qt 4.5 and 4.6.

Task-number:    QTBUG-7156
(cherry picked from commit 45af493eeeb408f756cc7d76088cbc3e35f5f54b)

8 years agoPrevent a crash when creating an inputContext from the QApplication dtor.
Simon Hausmann [Tue, 12 Jan 2010 08:42:00 +0000 (09:42 +0100)]
Prevent a crash when creating an inputContext from the QApplication dtor.

Complete the fix in f72165460d27860cabd51691f4d935fd74b50f80 by applying
the same fix to Symbian and QWS.

Task-number: QTBUG-7105
Reviewed-by: Alexis
Reviewed-by: Jason McDonald
(cherry picked from commit 8b56ffee8bb4ec0c56c2c05ccc1e088f6d9ae8a8)

8 years agoPrevent a crash when creating an inputContext from the QApplication dtor.
Denis Dzyubenko [Tue, 5 Jan 2010 12:42:49 +0000 (13:42 +0100)]
Prevent a crash when creating an inputContext from the QApplication dtor.

When accessing the global input context from the QWidget destructor access it
directly instead of calling a helper function.  Don't even bother to create an
input context if QApplication is being destroyed (just in case if the user is
calling the QApplication::inputContext manually from the destructor).

Task-number: QTBUG-7105
Reviewed-by: Simon Hausmann
(cherry picked from commit f72165460d27860cabd51691f4d935fd74b50f80)

8 years agoDocument the QGraphicsView::IndirectPainting flag
Olivier Goffart [Thu, 15 Oct 2009 08:05:12 +0000 (10:05 +0200)]
Document the QGraphicsView::IndirectPainting flag

And that the QGraphics{View,Scene}::drawItems function are now obsolete.

Reviewed-by: Alexis
(cherry picked from commit 3062035b9b38457196869b93650929f95cbd709f)

8 years agoFixed build breakage on S60 3.1 due to audio effects changes
Gareth Stockwell [Fri, 8 Jan 2010 15:07:36 +0000 (15:07 +0000)]
Fixed build breakage on S60 3.1 due to audio effects changes

Removed calls to the video overload of the audio effect
constructors, e.g. CAudioEqualizer::NewL(VideoPlayerUtility&)

Task-number: QTBUG-7223
Reviewed-by: trustme
(cherry picked from commit a3e6a04448979aaa6ada7aa434de3137f6cf0563)

8 years agoImplemented node disconnection in Phonon MMF backend
Gareth Stockwell [Fri, 4 Dec 2009 11:49:12 +0000 (11:49 +0000)]
Implemented node disconnection in Phonon MMF backend

Task-number: QTBUG-4663
Reviewed-by: Frans Englich
(cherry picked from commit 3f648dc075689e2ffedda2769cc76b4a56fb1073)

8 years agoRemoved dead code from Phonon MMF backend
Gareth Stockwell [Wed, 2 Dec 2009 17:03:48 +0000 (17:03 +0000)]
Removed dead code from Phonon MMF backend

The following source types are handled in MediaObject::createPlayer
Invalid, Disc, Stream, Empty

The code removed in this patch is therefore never executed.

Reviewed-by: Frans Englich
(cherry picked from commit 8e21fc62fe40c8e393007516958c216ad8dbd629)

8 years agoRe-emit prefinishMarkReached and aboutToFinish if rewound back past mark.
Gareth Stockwell [Tue, 8 Dec 2009 10:31:26 +0000 (10:31 +0000)]
Re-emit prefinishMarkReached and aboutToFinish if rewound back past mark.

Task-number: QTBUG-6214
Reviewed-by: Frans Englich
(cherry picked from commit fe5b275bfab1605da3ee95b6eb1d976aecb0a8a8)

8 years agoImplemented support for playlist handling in Phonon MMF backend
Gareth Stockwell [Wed, 2 Dec 2009 16:20:00 +0000 (16:20 +0000)]
Implemented support for playlist handling in Phonon MMF backend

The main changes are:
1. MediaObject emits prefinishMark at the appropriate instant
2. MediaObject emits aboutToFinish at the appropriate instant
3. MediaObject switches to next source when playback completes

Task-number: QTBUG-6214
Reviewed-by: Frans Englich
(cherry picked from commit 89e1e7fcbcbe93d8096afe0f7c240fe706cc9069)

8 years agoChanged call sequence of seeking in Phonon MMF backend, for streaming
Gareth Stockwell [Tue, 1 Dec 2009 18:51:45 +0000 (18:51 +0000)]
Changed call sequence of seeking in Phonon MMF backend, for streaming

Modified the sequence of calls made to the MMF APIs when seeking
during ongoing playback.  This fixes a bug found during early testing
of streaming playback, whereby playback would not resume following
the seeking operation.  This was due to an interaction between the
pause / seek / play operations, and the buffering callbacks received
from the MMF, which caused the backend to enter an incorrect state.

Task-number: QTBUG-4660
Reviewed-by: Frans Englich
(cherry picked from commit 66b765734585971dd9d248059701fdecebbccd78)

8 years agoImplemented buffer status notifications in Phonon MMF backend
Gareth Stockwell [Tue, 1 Dec 2009 17:55:30 +0000 (17:55 +0000)]
Implemented buffer status notifications in Phonon MMF backend

When clips are buffering (either at the start of playback, or
during playback, when buffer levels drop due to e.g. CPU, file system
or network load), the backend receives notification from the MMF.

While buffering is ongoing, the backend periodically queries the
filling status and emits a signal.

Task-number: QTBUG-4660
Reviewed-by: Frans Englich
(cherry picked from commit bed33ac62d87073120d56ff75a3d2356c99c64ea)

8 years agoAdded support for streaming playback to Phonon MMF backend
Gareth Stockwell [Thu, 5 Nov 2009 18:13:47 +0000 (18:13 +0000)]
Added support for streaming playback to Phonon MMF backend

Because the MIME type of the stream cannot always be deduced from the
URL, we assume that it is a video stream.  This is based on the
assumption that the video controllers will be capable of parsing
the container formats for audio-only, as well as video clips.  Note
that this assumption may not hold on all devices.

Note that most implementations of the MMF client APIs do not support
HTTP streaming (a.k.a. progressive download).  The backend has therefore
only been tested with RTSP streams - see the JIRA entry for further

Task-number: QTBUG-4660
Reviewed-by: Frans Englich
(cherry picked from commit 3117e3a6a9c1bf95fc30ebee4d8d11b646cb7125)

8 years agoPhonon MMF: leaves during object construction throw exceptions
Gareth Stockwell [Thu, 3 Dec 2009 15:44:55 +0000 (15:44 +0000)]
Phonon MMF: leaves during object construction throw exceptions

Reviewed-by: Frans Englich
(cherry picked from commit bbab8eabb91b95dcd946c94b5f0ac59413e7a929)

8 years agoRemoved stale TODO comments from Phonon MMF backend
Gareth Stockwell [Wed, 2 Dec 2009 16:59:46 +0000 (16:59 +0000)]
Removed stale TODO comments from Phonon MMF backend

Reviewed-by: Frans Englich
(cherry picked from commit 99b10b64fd5f68c63e0c406558b507e429eea248)

8 years agoCorrectly determine QScriptValue::isQObject() for QObjects using the
Michael Brasser [Mon, 11 Jan 2010 01:01:18 +0000 (11:01 +1000)]
Correctly determine QScriptValue::isQObject() for QObjects using the

Task-number: QTBUG-6178
Reviewed-by: Kent Hansen
Reviewed-by: Aaron Kennedy
(cherry picked from commit 31cc1b382fbcd77def12cd0ad4fe9fc0fabdf60b)

8 years ago(Sqlite2) Fix for QTBUG-6421
Bill King [Mon, 11 Jan 2010 04:15:56 +0000 (14:15 +1000)]
(Sqlite2) Fix for QTBUG-6421

Forgot to port the fix over to sqlite2 which seems to also be affected
by the setForwardOnly caching bug as well.

Task-number: QTBUG-6421
Reviewed-by: Justin McPherson
(cherry picked from commit 8d76de98d93421395306941e59d136f1e7395d15)

8 years agoAdded UIDs and icons to some webkit examples
Miikka Heikkinen [Thu, 7 Jan 2010 11:42:05 +0000 (13:42 +0200)]
Added UIDs and icons to some webkit examples

Reviewed-by: TrustMe
(cherry picked from commit 60d27f4b9fd2dbed204260334b817ce41788cb3e)

8 years agoSeparated "make run" and "make runonphone" targets
Miikka Heikkinen [Thu, 7 Jan 2010 13:10:07 +0000 (15:10 +0200)]
Separated "make run" and "make runonphone" targets

Reviewed-by: axis
(cherry picked from commit e2f2765b52508515874edea7015c01eb95ff89be)

8 years agoFixed "run" makefile target documentation for Symbian
Miikka Heikkinen [Tue, 5 Jan 2010 10:15:00 +0000 (12:15 +0200)]
Fixed "run" makefile target documentation for Symbian

"run" target no longer is just for running emulator targets.
Also added TRK for optional requirements.

Reviewed-by: axis
(cherry picked from commit 1ae7c8d8f549cadda4780835d85235085cc5583c)

8 years agoDeal with test cases that crash or hang
Shane Kearns [Tue, 22 Dec 2009 16:14:59 +0000 (16:14 +0000)]
Deal with test cases that crash or hang

Added an optional timeout to runonphone - the application will be killed
after this time. Used when autotesting unattended, as some tests can hang.

Handled the just in time debug halting the application when it is about
to crash, by terminating the application. In future, we could capture a
call stack or something here.

Also added quiet/verbose options to control the amount of output from

Reviewed-by: Janne Koskinen
(cherry picked from commit 0e94349de0b602f1b6af747b66ef03b22133cc3a)

8 years agoEnable building with MSVC2008
Shane Kearns [Thu, 7 Jan 2010 17:46:16 +0000 (17:46 +0000)]
Enable building with MSVC2008

Removed the alternate implementation of the registry reading, although
the new API is simpler, the old XP method is not deprecated.
Added an extra library that is needed according to API documentation,
but is omittable on MinGW.
Also gave a better error message when serial port detection fails.

Reviewed-by: Miikka Heikkinen
(cherry picked from commit 32419380bdd11e7db401fd37a840e0ec4f5b6845)

8 years agoRemoved QtWebkit.dll from Qt.sis in Symbian builds
Miikka Heikkinen [Tue, 29 Dec 2009 11:36:54 +0000 (13:36 +0200)]
Removed QtWebkit.dll from Qt.sis in Symbian builds

In preparation for future removal of Webkit from Qt, Qt.sis no longer
contains QtWebkit.dll. All projects that have webkit dependency now
automatically also add dependency qtwebkit.sis into their .pkg files.

To create qtwebkit.sis, run "make sis" in  src\3rdparty\webkit\WebCore

Task-number: QTBUG-6841
Reviewed-by: Simon Hausmann
Reviewed-by: Janne Koskinen
(cherry picked from commit 337931b28cb1157512ae2b6ab67ceaaf63bf1e48)

8 years agoAdded mention of Symbian binary packages to INSTALL file
Miikka Heikkinen [Fri, 8 Jan 2010 10:30:43 +0000 (12:30 +0200)]
Added mention of Symbian binary packages to INSTALL file

Task-number: QTBUG-6162
Reviewed-by: TrustMe
(cherry picked from commit 1f8fa41e78b4174ab64953dd80a1d562b0afc5aa)

8 years agoAdded a flag to avoid construction of application panes.
axis [Thu, 7 Jan 2010 15:01:58 +0000 (16:01 +0100)]
Added a flag to avoid construction of application panes.

This is purely an optimization for fullscreen-only apps.

Task:     QTBUG-6098
RevBy:    Jason Barron
RevBy:    mread
AutoTest: Included
(cherry picked from commit 4a84b272459160780529f654e6aee3abf8569b51)

8 years agoFix for QTBUG-5870 QGraphicsProxyWidget does not show children on
Jani Hautakangas [Fri, 8 Jan 2010 07:54:48 +0000 (09:54 +0200)]
Fix for QTBUG-5870 QGraphicsProxyWidget does not show children on

QS60PaintEngine returned wrong device in QPaintEngine::paintDevice().

Task-number: QTBUG-5870
Reviewed-by: Jason Barron
(cherry picked from commit 4378b168ad289e1acbde9580b750ce04b51260c3)

8 years agoSymbian: More i18n strings work.
Frans Englich [Mon, 7 Dec 2009 14:09:33 +0000 (15:09 +0100)]
Symbian: More i18n strings work.

* Consistently capitalize error sentences
* Simplify & fix code/documentation.

Task-number: QTBUG-4994
Reviewed-by: TrustMe
(cherry picked from commit db782f7ab22241d8161190b95c41af4d56c05b82)

8 years agoFixed bug which caused Phonon backend error messages to be suppressed
Gareth Stockwell [Tue, 1 Dec 2009 14:35:43 +0000 (14:35 +0000)]
Fixed bug which caused Phonon backend error messages to be suppressed

When the mediaplayer receives a state change into the ErrorState, it
calls pause() on the media object.  Previously, this caused the
backend to transition into PausedState.  When the mediaplayer subsequently
called errorString() to retrieve the error message, an empty string was
returned because the backend was no longer in the ErrorState.

Task-number: QTBUG-4994
Reviewed-by: trustme
(cherry picked from commit dfa9343cc1e634eebdb0f3a2cf931ada9829ae6b)

8 years agoAdded error strings to Phonon MMF backend
Gareth Stockwell [Wed, 2 Dec 2009 11:39:44 +0000 (11:39 +0000)]
Added error strings to Phonon MMF backend

Note that changing Utils from a namespace into a class, and then
using Q_DECLARE_TR_FUNCTIONS in the class declaration, was necessary
in order to be able to call tr(...) from the implementation of

Task-number: QTBUG-4994
Reviewed-by: Oswald Buddenhagen
(cherry picked from commit 3ed427637dd76da371174e14b0f7f2a15801fcac)

8 years agoDeploy sqlite3.sis instead of sqlite3.dll in Symbian
Miikka Heikkinen [Thu, 7 Jan 2010 15:25:13 +0000 (17:25 +0200)]
Deploy sqlite3.sis instead of sqlite3.dll in Symbian

Task-number: QTBUG-4879
Reviewed-by: Shane Kearns
(cherry picked from commit 784374ac949ecf2fdc6895908e1e4dfe938931b8)

8 years agoMake sure the rect in QPixmap::copy() doesn't exceed the boundingRect.
Gunnar Sletta [Fri, 8 Jan 2010 09:57:43 +0000 (10:57 +0100)]
Make sure the rect in QPixmap::copy() doesn't exceed the boundingRect.

Task: http://bugreports.qt.nokia.com/browse/QTBUG-6303
Reviewed-by: Samuel
(cherry picked from commit 1484008e831a6b18272babb17992c4de686da045)

8 years agoRevert "QStyleSheetStyle: Fixed some text croped when having padding with native...
Olivier Goffart [Wed, 6 Jan 2010 14:09:21 +0000 (15:09 +0100)]
Revert "QStyleSheetStyle: Fixed some text croped when having padding with native border."

This reverts commit 6e90192b599cee9b903177a0978198326f667613.

his change the behaviour a little bit. It is better to wait for Qt 4.7

Reviewed-by: jbache
(cherry picked from commit 092f2014cf81d9f58670ede7d381022dd6903cbb)

8 years agoChangelog: Added Designer/uic entries for 4.6.1
Friedemann Kleint [Tue, 5 Jan 2010 11:20:06 +0000 (12:20 +0100)]
Changelog: Added Designer/uic entries for 4.6.1
(cherry picked from commit 547e117e7463db85651d910d5a627806388b9afc)

8 years agoFix performance regression in _q_polishItems.
Alexis Menard [Thu, 7 Jan 2010 15:13:14 +0000 (16:13 +0100)]
Fix performance regression in _q_polishItems.

QSet is a hash internally, using Iterator::begin while erasing elements
inside the set might create holes and then the complexity increase.

We now use the return value of erase (the next element) so the
complexity is linear.

For those who create/delete item in the polish event (BAD), _q_polishItem
might be slower than the normal call.

(cherry picked from commit 6026436f0de6020252410c021e0745a22599b159)

8 years agoAvoid a deep copy of QImage::bits() in the png writer
Rhys Weatherley [Wed, 6 Jan 2010 22:38:35 +0000 (08:38 +1000)]
Avoid a deep copy of QImage::bits() in the png writer

Task-number: QTBUG-7161
Reviewed-by: Daniel Pope
(cherry picked from commit 80e6ea3e871fa9f0e5a21d48ad893d4ec59c5c1c)

8 years agoRevert "Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram"
Tom Cooksey [Wed, 6 Jan 2010 13:55:31 +0000 (14:55 +0100)]
Revert "Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram"

We don't add new public methods in patch releases.

This reverts commit 2b4d3391fd922dfc5ac28815bbd5f36c4041b658.

This patch also fixes the paint engine to use glUniformMatrix3fv
directly now it has been removed from 4.6. It is a 3 line change.

Reviewed-By: Samuel
(cherry picked from commit b1327abb777ff3ee7ae32690442ca1250f536054)

8 years agoIntroduce new "snapToPixelGrid" flag to GL2 engine for drawText
Tom Cooksey [Sun, 3 Jan 2010 14:35:53 +0000 (15:35 +0100)]
Introduce new "snapToPixelGrid" flag to GL2 engine for drawText

When we're rendering text, the glyphs need to be aligned to the
pixel grid otherwise we get strange artifacts. Normally text is
drawn at integer coordinates, however it is still possible to
have a transform which translates by a non-integer offset. This
patch adds a flag to the engine which can be used to snap any
translate to the pixel grid.

Task-number: QTBUG-7094
Reviewed-By: Kim
(cherry picked from commit 1e7922262c29ba29a70226cf8894645f46df3ca2)

8 years agodoc: Clarified which values were added in Qt 4.4.
Martin Smith [Tue, 5 Jan 2010 09:14:51 +0000 (10:14 +0100)]
doc: Clarified which values were added in Qt 4.4.

Task-number:    QTBUG-7118
(cherry picked from commit c08789f4540ac934ac4a20feaac205837fb0cf6f)

8 years agoQBoxLayout::setGeometry would not respect the widget min/max width
Gabriel de Dietrich [Wed, 6 Jan 2010 14:36:21 +0000 (15:36 +0100)]
QBoxLayout::setGeometry would not respect the widget min/max width

When calling heightforWidth after a geometry change, the width actually used
could be outside the widget's width bounds. The height could then be smaller
than needed to fit the widget's contents resulting in a clipped widget being
drawn. Auto-test included.

Reviewed-by: Olivier
Task-number: QTBUG-7103
(cherry picked from commit 94759a0ed565b21c8dbfb4b12bfe6064f156b410)

8 years agodoc: Removed a const from a declaration in the example.
Martin Smith [Mon, 4 Jan 2010 11:46:14 +0000 (12:46 +0100)]
doc: Removed a const from a declaration in the example.

Task-number:    QTBUG-7092
(cherry picked from commit 0e4c54809a8195a199d85b143e042b0f5e53fb4c)

8 years agoSet serial number in QX11PixmapData::transformed
Anders Bakken [Thu, 31 Dec 2009 00:16:59 +0000 (16:16 -0800)]
Set serial number in QX11PixmapData::transformed

QX11PixmapData::transformed initializes a new QX11PixmapData object but
doesn't set its serial number.

Reviewed-by: Donald Carr <donald.carr@nokia.com>
(cherry picked from commit eb94abb952114e826e02ba4562d9048e77f46644)

8 years agoReset the OpenVG scissor after a native painting call-out
Rhys Weatherley [Mon, 4 Jan 2010 01:15:52 +0000 (11:15 +1000)]
Reset the OpenVG scissor after a native painting call-out

Task-number: QTBUG-7051
Reviewed-by: Daniel Pope
(cherry picked from commit fbccab463a8bd77d66adb9f96a67037f73f0019d)

8 years agoFix background brush for character format when writing to ODF document.
Pierre Rossi [Wed, 30 Dec 2009 13:38:59 +0000 (14:38 +0100)]
Fix background brush for character format when writing to ODF document.

Task-number: QTBUG-7047
Reviewed-by: Benjamin Poulain
(cherry picked from commit 51c4571caf5d5ffb2545106df47d7c399b3e228b)

8 years agoAvoid deep QImage copies in the OpenVG paint engine
Rhys Weatherley [Mon, 4 Jan 2010 01:32:37 +0000 (11:32 +1000)]
Avoid deep QImage copies in the OpenVG paint engine

Task-number: QTBUG-7015
Reviewed-by: Daniel Pope
(cherry picked from commit b0e7ef2aa62a123b51920b8f0a08af07a9cd9d09)

8 years agodoc: Clarified next and previous activation order.
Martin Smith [Tue, 5 Jan 2010 08:01:47 +0000 (09:01 +0100)]
doc: Clarified next and previous activation order.

Task-number:    QTBUG-6992
(cherry picked from commit 049f65b4d07587e26c69602e6e59682e82948bd2)

8 years agoFixed a copy-paste error in QRasterPixmapData::metric().
Trond Kjernåsen [Tue, 29 Dec 2009 10:04:58 +0000 (11:04 +0100)]
Fixed a copy-paste error in QRasterPixmapData::metric().

Calling metric() to get the device height in mm of a pixmap when using
the raster engine would actually return the width..

Task-number: QTBUG-6985
Reviewed-by: Carlos Duclos
(cherry picked from commit 4bd7e6930fcd9e04696aa5426691cd90ba383a32)

8 years agodoc: Fixed typo.
Martin Smith [Tue, 5 Jan 2010 09:27:28 +0000 (10:27 +0100)]
doc: Fixed typo.

Task-number:    QTBUG-6978
(cherry picked from commit fee4ec0c8f507fae4f6795f43dca1333f46c9922)

8 years agoFixes painting artifacts when using CacheBackground in a QGraphicsView.
Yoann Lopes [Wed, 30 Dec 2009 12:44:58 +0000 (13:44 +0100)]
Fixes painting artifacts when using CacheBackground in a QGraphicsView.

The problem was that when the background cache was invalidated, it was
entirely recreated but only the exposed area of the view was repainted
in it, causing the cache to be partly empty in some cases. Now the
background cache is always fully repainted when it is invalidated.

Task-number: QTBUG-6935
Reviewed-by: ogoffart
(cherry picked from commit 2600fd42117913b427d07e510724b0ea5e355205)

8 years agodoc: Replaced usses of rootState() with state machine pointer.
Martin Smith [Tue, 5 Jan 2010 10:35:09 +0000 (11:35 +0100)]
doc: Replaced usses of rootState() with state machine pointer.

The root state of a QStateMachine is now the state machine itself.

Task-number:    QTBUG-6907
(cherry picked from commit 553e0cafa578ece64c07afa11571eca4c7b9444c)

8 years agoFixes crash when widget with WA_StaticContents child become toplevel.
Olivier Goffart [Tue, 29 Dec 2009 11:44:04 +0000 (12:44 +0100)]
Fixes crash when widget with WA_StaticContents child become toplevel.

Happens for example if a DockWidget is undocked and has a child
whith the WA_StaticContents attribute.

The parent does not change (so newParent is false) but still, the
top level widget change. So staticWidget need to be moved to the
new backingstore.

Reviewed-by: Benjamin Poulain
Task-number: QTBUG-6883
(cherry picked from commit 03baad51d584778a99f4b393232ccc1312db3391)

8 years agoBitsPerSample should default to 1 in TIFF files.
Rhys Weatherley [Mon, 4 Jan 2010 21:50:44 +0000 (07:50 +1000)]
BitsPerSample should default to 1 in TIFF files.

Task-number: QTBUG-6870
Reviewed-by: Lorn Potter
(cherry picked from commit f019f3cf807e3c804bba3ef5598ea69adbb39e8b)