8 years agoUpdate README: rm qconfig files too README
Thiago Macieira [Mon, 6 Sep 2010 21:04:08 +0000 (23:04 +0200)]
Update README: rm qconfig files too

9 years agoUpdate README with info on how to update kde-qt with a new Qt release
Thiago Macieira [Tue, 1 Dec 2009 19:03:35 +0000 (20:03 +0100)]
Update README with info on how to update kde-qt with a new Qt release

9 years agoUpdate README with instructions for patching after new model is in
Thiago Macieira [Tue, 1 Dec 2009 18:31:10 +0000 (19:31 +0100)]
Update README with instructions for patching after new model is in

9 years agoUpdate README file.
Thiago Macieira [Tue, 1 Dec 2009 18:28:22 +0000 (19:28 +0100)]
Update README file.

There's no more Qt Software and the bug reporting system is now JIRA
at http://bugreports.qt.nokia.com

9 years agoUpdate this file to reflect the workflow with Git, as well as use Git commands
Thiago Macieira [Sun, 21 Jun 2009 16:46:54 +0000 (13:46 -0300)]
Update this file to reflect the workflow with Git, as well as use Git commands

9 years agoImport README.qt-copy from the original qt-copy
Thiago Macieira [Sun, 21 Jun 2009 16:17:13 +0000 (13:17 -0300)]
Import README.qt-copy from the original qt-copy

9 years agoFix incorrect year and version number in assistant docs. v4.5.1
kh [Tue, 21 Apr 2009 15:31:08 +0000 (17:31 +0200)]
Fix incorrect year and version number in assistant docs.

Should have been part of 8aa8997f18afb85cb17f5b2a875a004302df4c72
Sorry the HOWTO file was not entirely clear that the *.qch needs
to be updated too.

Task-number: 251421
Reviewed-by: kh
(cherry picked from commit 0b3ef41cdc8fef79d184e91d2542cc34f7dec5e1)

9 years agoBT: Revert "Fixes: Don't fill the pixmap because we will copy the cache into it."
Andreas Aardal Hanssen [Tue, 21 Apr 2009 14:05:42 +0000 (16:05 +0200)]
BT: Revert "Fixes:    Don't fill the pixmap because we will copy the cache into it."

This reverts commit 0985805ab3c7de5b15c115a98afb15944b6d93b9.

The Elastic Nodes example shows a black background for the cache pixmap
if the call to fill isn't there. Alexis and I both agree that it makes
no sense that we fill the pixmap with transparent pixels instead of
just drawing with QPainter::CompositionMode_Source, but since this
regression was introduced after 4.5.0 was released we must revert before
we investigate further.

Reviewed-by: Alexis
(cherry picked from commit 183cb6052c45d7c83e36c78da4e2c59c768209c7)

9 years agoBT: Fix update regression for cached QGraphicsItem (Elastic Nodes stuck)
Andreas Aardal Hanssen [Tue, 21 Apr 2009 13:57:05 +0000 (15:57 +0200)]
BT: Fix update regression for cached QGraphicsItem (Elastic Nodes stuck)

This fixes a bug in 4.5.0 where cached items that call update() after
they have been moved or transformed failed to get a call to paint(),
so the last cache image was used to draw. The easiest way to reproduce
this bug is in the Elastic Nodes example. If you press, wait, then
release, the nodes will consistently move to sunken state, then back
to normal state. But if you click quickly while moving the mouse, the
nodes will stay sunken.

The bug was that the item was marked as dirty as a result of being moved,
and when the mouse button was released, the node item's call to update()
was discarded, as the item was "already dirty".

The fix is to allow invalidation of the cache even if the item is
marked as dirty.

Reviewed-by: bnilsen
(cherry picked from commit 08feb22f9a924ce120da8b5c6e1669d2a630dd54)

9 years agoBT: Make things work on 10.3
Norwegian Rock Cat [Tue, 21 Apr 2009 13:50:18 +0000 (15:50 +0200)]
BT: Make things work on 10.3

The #ifdef was typed wrong.

Reviewed-by: Prasanth Ullattil
(cherry picked from commit 924feac07729b680fbd337e3773c747b64e1da61)

9 years agoWe don't need to call two times itemChange when an item is deleted.
Alexis Menard [Tue, 21 Apr 2009 13:25:51 +0000 (15:25 +0200)]
We don't need to call two times itemChange when an item is deleted.
Previously we were calling two times itemChange on the parent to give
QGraphicsItem::ItemChildAddedChange. We don't need that. One is enough.

BT : yes
Task-number: BT
Reviewed-by: Andreas
(cherry picked from commit 95b7c50e503dd4743e22c35f341aa31105ea7d73)

9 years agoBT: Fix lock-up & crash in the Elastic Nodes example
Andreas Aardal Hanssen [Tue, 21 Apr 2009 11:38:30 +0000 (13:38 +0200)]
BT: Fix lock-up & crash in the Elastic Nodes example

Ensure that we don't divide by 0 when two nodes are exactly on top
of each other.

Reviewed-by: Alexis
Reviewed-by: Joao
(cherry picked from commit 6a3735a47de8a9851e7795cf023d95d81867260d)

9 years agoDoc - Changed the namespace in the qdocconf file to reflect Qt 4.5.1
kh [Tue, 21 Apr 2009 10:49:50 +0000 (12:49 +0200)]
Doc - Changed the namespace in the qdocconf file to reflect Qt 4.5.1

should have been part of c8285ec610b02f440f692be90aed1e6925a8675

Task-number: 251346
Reviewed-by: TrustMe
BT: yes
(cherry picked from commit 92f07dcd690d596e2d6cc32211c142cd0e25fd97)

9 years agoBT: Remove turkish translation files created by previous change.
Jason McDonald [Tue, 21 Apr 2009 06:50:01 +0000 (16:50 +1000)]
BT: Remove turkish translation files created by previous change.

Remove the *_tr_TR.ts files added in change
5e3cae2754bf5f50aa10fef2c8d3bb7d33407b96 and remove their entries from
.pro files to prevent them coming back next time someone does "make ts".

Reviewed-by: Trust Me
(cherry picked from commit b2112b17e427274ac0610416b2941b091314f5ad)

9 years agoBT: Update text of About Qt dialog
Jason McDonald [Mon, 20 Apr 2009 08:24:26 +0000 (18:24 +1000)]
BT: Update text of About Qt dialog

Add Copyright message as requested by Legal, and update .ts files again.

Reviewed-by: Trust Me
(cherry picked from commit 3bcbfcfa466890469f3053a3c5987bc2cf85317b)

9 years agoBT: Fix a crash when using Q(File)Dialog::open() in QCocoa.
Norwegian Rock Cat [Mon, 20 Apr 2009 07:49:55 +0000 (09:49 +0200)]
BT: Fix a crash when using Q(File)Dialog::open() in QCocoa.

If we don't have a sheet, we need to recreate it in Cocoa.
Unfortunately, we neglected to reassign the NSWindow pointer in that
case, so the program would crash.

Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit 9d9889682c79bacb803ef5613502e7307c1d16bd)

9 years agoFix the About Qt dialog text to be truthful, post-LGPL
Jason McDonald [Sat, 18 Apr 2009 08:55:12 +0000 (18:55 +1000)]
Fix the About Qt dialog text to be truthful, post-LGPL

Update the text of the About Qt dialog, as directed by Legal.  Note that
this change breaks string freeze as the text is translatable, however
Legal has decided that shipping legally correct text has priority over
shipping complete translations.  This change includes updated .ts files
to correct the source strings, but no updated translations.

This change also removes out-of-date licensing text from the About
dialogs of Designer, Assistant, Linguist, QtConfig and qdbusviewer.
Those particular changes should not break translations as they only
remove translatable strings and do not modify any others.

Task-number: 247608
Reviewed-by: Trust Me
.....review will be conducted after submission.
(cherry picked from commit 5e3cae2754bf5f50aa10fef2c8d3bb7d33407b96)

9 years agoBT: Obsolete license text
Jason McDonald [Fri, 17 Apr 2009 14:23:51 +0000 (00:23 +1000)]
BT: Obsolete license text

In the docs, index.html had a statement about licensing that is no
longer true, plus the file it linked to longer exists.  This change
removes the offending paragraph from the docs.

Task-number: 251348
Reviewed-by: Carlos Duclos
(cherry picked from commit 81c7a8b453726bb4aff11f2382284fc144eeda78)

9 years agoBT: Make native QFontDialog work when using show and changing windows
Norwegian Rock Cat [Fri, 17 Apr 2009 12:55:12 +0000 (14:55 +0200)]
BT: Make native QFontDialog work when using show and changing windows

Cocoa's font manager uses "first responder" which is a great idea, but
breaks as soon as we change windows. Thankfully we can just set the
target and we are OK. An upshot is that we don't need the delegate, but
I'm not going to push my luck on that.

Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit 7c815bc2d4ea922d75f49f7dc29c81362ce5210e)

9 years agoFix a couple more unmaintained version numbers.
Jason McDonald [Fri, 17 Apr 2009 12:09:14 +0000 (22:09 +1000)]
Fix a couple more unmaintained version numbers.

I have now inspected all 4.x.y version numbers appearing in the depot.
All remaining instances appear to be acceptable.

Reviewed-by: Trust Me
(cherry picked from commit a46f54e0ad78ccb4ffaeee6befc7429f93740375)

9 years agoEven more cleanups on the Change Log.
Kavindra Devi Palaraja [Fri, 17 Apr 2009 11:26:59 +0000 (13:26 +0200)]
Even more cleanups on the Change Log.

Reviewed-by: TrustMe
BT: Yes
(cherry picked from commit e85867003ca1741f378b1f58f4dd9d48577a5d9b)

9 years agoFix obsolete version number in docs.
Jason McDonald [Fri, 17 Apr 2009 10:54:19 +0000 (20:54 +1000)]
Fix obsolete version number in docs.

Replace with %VERSION%, so we don't need to fix this for every release.

Task-number: 251417
Reviewed-by: Trust Me
(cherry picked from commit 2df5b45eed7059862e9dd10a74c19310266b9d55)

9 years agoFix obsolete version number in docs.
Jason McDonald [Fri, 17 Apr 2009 10:45:11 +0000 (20:45 +1000)]
Fix obsolete version number in docs.

Use %VERSION% so that we don't have to fix this for every release.

Task-number: 251418
Reviewed-by: Trust Me
(cherry picked from commit cfa04d53ff58d45d7811637c8be76099740d25c5)

9 years agoWrong version number in windows installation doc.
Jason McDonald [Fri, 17 Apr 2009 10:28:23 +0000 (20:28 +1000)]
Wrong version number in windows installation doc.

Doc still referred to 4.4.0-rc1 - replace with %VERSION% so we don't
have to keep updating this.

Task-number: 251419
Reviewed-by: Trust Me
(cherry picked from commit 569394738995b6792f6e4866f0daf12897975ad4)

9 years agoRemove out-of-date Cocoa known issues page.
Jason McDonald [Fri, 17 Apr 2009 13:28:08 +0000 (23:28 +1000)]
Remove out-of-date Cocoa known issues page.

This page is not linked from anywhere, and its content is horribly

Task-number: 251420
Reviewed-by: nrc
(cherry picked from commit c138c9e80acabcf1d9a712a7ebd2b2a7d6135d8b)



9 years agoFix incorrect year and version number in assistant docs.
Jason McDonald [Fri, 17 Apr 2009 10:06:09 +0000 (20:06 +1000)]
Fix incorrect year and version number in assistant docs.

Task: 251421
Reviewed-by: Trust Me
(cherry picked from commit 8aa8997f18afb85cb17f5b2a875a004302df4c72)

9 years agoLine edit displays garbage when pressing up or down arrow keys (Cocoa).
Prasanth Ullattil [Fri, 17 Apr 2009 09:13:34 +0000 (11:13 +0200)]
Line edit displays garbage when pressing up or down arrow keys (Cocoa).

The unicode characters between 0xF700 & 0xF8FF are special function-key
code characters used by the NSEvent. These characters have to be ignored
when converting to a QString.

(cherry picked from commit 5d39d424a92d89243207d8370d0fa1c6c8061668)

9 years agoMore cleanups on the change log.
Kavindra Devi Palaraja [Fri, 17 Apr 2009 09:14:51 +0000 (11:14 +0200)]
More cleanups on the change log.

Reviewed-by: TrustMe
BT: Yes
(cherry picked from commit 2da87118ac000f754ca09ad2b14f1ec80a59b985)

9 years agoAdd my bugfix.
Ariya Hidayat [Fri, 17 Apr 2009 08:20:55 +0000 (10:20 +0200)]
Add my bugfix.
(cherry picked from commit c01ce578761aefc2c1780047aa666eb7ee96159f)

9 years agoBT: Fix version number in FAQ.txt.
Jason McDonald [Fri, 17 Apr 2009 13:24:49 +0000 (23:24 +1000)]
BT: Fix version number in FAQ.txt.

Don't state a specific version number, or we'll keep forgetting to
update it.

Task-number: 251338
Reviewed-by: Trust Me
(cherry picked from commit 08934a1647d60150d260275b4aac7d680bce3cfe)



9 years agoAllow -help to be used in a non-eval package.
Lincoln Ramsay [Fri, 17 Apr 2009 05:07:45 +0000 (15:07 +1000)]
Allow -help to be used in a non-eval package.

The previous logic caused a license check when the eval
license file was missing.

Reviewed-by: Jason McDonald
Task-number: 251339
(cherry picked from commit 8eb08c8c294f00763961e86cc3370b0ef78c8976)

9 years agoBT: Whats new doc page has a link to changes-4.5.0 file instead of 4.5.1
Jason McDonald [Fri, 17 Apr 2009 04:22:30 +0000 (14:22 +1000)]
BT: Whats new doc page has a link to changes-4.5.0 file instead of 4.5.1

Restore the text that is omitted for a minor release but included in
patch releases.  Also fixes obsolete link to changes files.

Reviewed-by: Trust Me
(cherry picked from commit e389dc42a1d3d473eac34987767b94dbe623a275)

9 years agoDocument my QGLFramebufferObject change
Rhys Weatherley [Fri, 17 Apr 2009 03:42:46 +0000 (13:42 +1000)]
Document my QGLFramebufferObject change
(cherry picked from commit 095c4209fe8fea6d46cc6c1486d2bc6471e8f0a5)

9 years agoRevert "Changing version from 4.5.0 to 4.5.1 in What's new section."
Jason McDonald [Fri, 17 Apr 2009 13:13:35 +0000 (23:13 +1000)]
Revert "Changing version from 4.5.0 to 4.5.1 in What's new section."

This reverts commit b173f1671fd35c6ae674f5368f7a8b66a0f15322.

9 years agoChanging version from 4.5.0 to 4.5.1 in What's new section.
Carlos Manuel Duclos Vergara [Fri, 17 Apr 2009 11:41:49 +0000 (13:41 +0200)]
Changing version from 4.5.0 to 4.5.1 in What's new section.

9 years agoMerge branch '4.5.1' of git@scm.dev.troll.no:qt/qt-releases into 4.5.1
Carlos Manuel Duclos Vergara [Fri, 17 Apr 2009 11:40:17 +0000 (13:40 +0200)]
Merge branch '4.5.1' of git@scm.dev.troll.no:qt/qt-releases into 4.5.1

9 years agoDocument my changes for 4.5.1
Rhys Weatherley [Thu, 16 Apr 2009 22:10:29 +0000 (08:10 +1000)]
Document my changes for 4.5.1
(cherry picked from commit 90d7509e4a1543e43a49bfb25dd672d824c4fde3)

9 years agoBT:Stop widgets disappearing in unified when clicking the toolbar button
Norwegian Rock Cat [Thu, 16 Apr 2009 15:15:16 +0000 (17:15 +0200)]
BT:Stop widgets disappearing in unified when clicking the toolbar button

The comment in the code pretty much says it all, so I'll repeat it:

This is a workaround for NSToolbar. When a widget is hidden by
clicking the toolbar button, Cocoa reparents the widgets to another
window (but Qt doesn't know about it).  When we start showing them,
it reparents back, but at this point it's window is nil, but the
window it's being brought into (the Qt one) is for sure created.
This stops the hierarchy moving under our feet.

Task-number: 251294
Reviewed-by: Prasanth Ullattil
(cherry picked from commit 139265031939d676f049edd2c91918040e0659b4)

9 years agoFirst round of change log cleanups.
Kavindra Devi Palaraja [Thu, 16 Apr 2009 15:18:15 +0000 (17:18 +0200)]
First round of change log cleanups.

Reviewed-by: TrustMe
BT: Yes
(cherry picked from commit 0aa3203fa13bfbc42e77488765023832934dd36b)

9 years agolog my changes
Oswald Buddenhagen [Thu, 16 Apr 2009 14:45:45 +0000 (16:45 +0200)]
log my changes
(cherry picked from commit 602da82d3c9413df41eb5b17bdf7e3c1586316b5)

9 years agoDoc - Changed the namespace in the qdocconf file to reflect Qt 4.5.1
Kavindra Devi Palaraja [Thu, 16 Apr 2009 14:41:39 +0000 (16:41 +0200)]
Doc - Changed the namespace in the qdocconf file to reflect Qt 4.5.1

Task-number: 251346
Reviewed-by: TrustMe
BT: Yes
(cherry picked from commit fc8285ec610b02f440f692be90aed1e6925a8675)

9 years agoDoc - Changed the link provided in the README file to one that does not
Kavindra Devi Palaraja [Thu, 16 Apr 2009 14:40:17 +0000 (16:40 +0200)]
Doc - Changed the link provided in the README file to one that does not
have a version number, so we do not have to update it each release.

Task-number: 251352
Reviewed-by: TrustMe
(cherry picked from commit 90ff6b0ad7397a6892185e8340d58dab4b85b032)

9 years agoDoc - Some minor cleanups in the documentation of QInputDialog. Also
Kavindra Devi Palaraja [Thu, 16 Apr 2009 14:39:10 +0000 (16:39 +0200)]
Doc - Some minor cleanups in the documentation of QInputDialog. Also
marked getInt() as since Qt 4.5 and finally modified the StandardDialogs
example to reflect the fact that getInteger() is deprecated.

Task-number: 251288
Reviewed-by: nrc <qt-info@nokia.com>
BT: Yes
(cherry picked from commit 08dff2935af2d71f2fe76182079da636c1bb6f5b)

9 years agochange log updated for 4.5.1
Joerg Bornemann [Thu, 16 Apr 2009 11:09:00 +0000 (13:09 +0200)]
change log updated for 4.5.1
(cherry picked from commit 78659fbe2d4ad8a01b41cb485f57b4a66c031fd5)

9 years agoChangelog
Richard Moe Gustavsen [Thu, 16 Apr 2009 11:05:47 +0000 (13:05 +0200)]

(cherry picked from commit b6a50971f51618a3965605d9223c8b2b06c23f29)

9 years agoBT: Mac: QtDemo is really sluggish when opening menus
Richard Moe Gustavsen [Thu, 16 Apr 2009 09:33:54 +0000 (11:33 +0200)]
BT: Mac: QtDemo is really sluggish when opening menus

This has to do with coalesced updates. The easy fix for now is
to fix QtDemo itself, meaning: always use a steady timer for
redrawing the viewport of the graphics view (as opposed to let
each item on screen calling update whenever they move)

Task-number: 250667
Reviewed-by: Trenton Schulz
(cherry picked from commit 4aa94a353224c14265446276277a91339f2e415d)

9 years agoFix crash in the SQLQueryModel tests
Olivier Goffart [Thu, 16 Apr 2009 08:40:11 +0000 (10:40 +0200)]
Fix crash in the SQLQueryModel tests

Amend fd5f83e612729cebc5395c992bd98628bb9ea25f

calling fetchMore in create_mapping was a bad idea bacause it may lead
to infinite recurtion
Make a special case for hasChildren instead

Task-number: 250023
Reviewed-by: Marius Bugge Monsen
BT: yes
(cherry picked from commit f8fba0d48a1f30540ddf15f0d36f415b192d1d8b)

9 years agoMy 4.5.1 changes.
Bjoern Erik Nilsen [Thu, 16 Apr 2009 08:24:56 +0000 (10:24 +0200)]
My 4.5.1 changes.
(cherry picked from commit 97ff2bde044838be0d5210a86c2fafd23c05d994)

9 years agoQX11Embed crashes on 64-bit Solaris
Bradley T. Hughes [Thu, 16 Apr 2009 06:45:58 +0000 (08:45 +0200)]
QX11Embed crashes on 64-bit Solaris

The data passed to XChangeProperty should be long arrays, as this is
what Xlib expects.

Task-number: 244062
Reviewed-by: Rhys Weatherley
(cherry picked from commit 1ae4c7b989b04f89a5069d5a5db78c0d8914972b)

9 years agoAdd sql changes to 4.5.1 changelog
Bill King [Thu, 16 Apr 2009 03:48:20 +0000 (13:48 +1000)]
Add sql changes to 4.5.1 changelog
(cherry picked from commit b01d52de1f942755c59e22d50b84dd37ffc8e3fe)

9 years agoFixing the release version in FAQ.txt.
Carlos Manuel Duclos Vergara [Thu, 16 Apr 2009 14:03:08 +0000 (16:03 +0200)]
Fixing the release version in FAQ.txt.

9 years agoFixes QSortFilterProxyModel not reporting child if the model need to fetchMore
Olivier Goffart [Tue, 14 Apr 2009 16:48:02 +0000 (18:48 +0200)]
Fixes QSortFilterProxyModel not reporting child if the model need to fetchMore

QSortFilterProxyModel::hasChildren need to construct the mapping. And when it
tries to construct the mapping, it needs to fetch the childs, so there is none.

Task-number: 250023
Reviewed-by: Marius Bugge Monsen
(cherry picked from commit fd5f83e612729cebc5395c992bd98628bb9ea25f)

9 years agoadd some comments
Oswald Buddenhagen [Wed, 15 Apr 2009 13:26:16 +0000 (15:26 +0200)]
add some comments
(cherry picked from commit 4f66b3c550ca1c90c33952ad8603cc6c1a702280)

9 years agoChangelog for 4.5.1
Denis Dzyubenko [Tue, 14 Apr 2009 11:09:00 +0000 (13:09 +0200)]
Changelog for 4.5.1
(cherry picked from commit c4846a0e62482abb28cdc973fb4823be3e71f4f7)

9 years agoFixed and improved the example code
Jan-Arve Sæther [Wed, 15 Apr 2009 14:15:14 +0000 (16:15 +0200)]
Fixed and improved the example code
(cherry picked from commit a1a3dd96aef2b2edd7eb7c563fabee124cdbfe5a)

9 years agoUpdated changes
Paul Olav Tvete [Wed, 15 Apr 2009 14:14:09 +0000 (16:14 +0200)]
Updated changes
(cherry picked from commit 0da3eabece2d33e2f8cdf421bbd8e95787c170f7)

9 years agoUpdate changelog with my changes
Bradley T. Hughes [Wed, 15 Apr 2009 13:16:17 +0000 (15:16 +0200)]
Update changelog with my changes
(cherry picked from commit 0da501b644c0799d4e5e357b27847cb7a58583e4)

9 years agoMake the configured namespace part of QT_BUILD_KEY_COMPAT too.
Jarek Kobus [Wed, 15 Apr 2009 13:15:25 +0000 (15:15 +0200)]
Make the configured namespace part of QT_BUILD_KEY_COMPAT too.

The eclipse integration is namespaced, but it still pulled in system plugins like the oxygen style through QT_BUILD_KEY_COMPAT check in QLibraryPrivate::isPlugin()

Task: 250185
Reviewed-by: dt <qtc-committer@nokia.com>
BT: yes
(cherry picked from commit cca58cff45ea248ab9c65fd8ce088433af1c0fe0)

9 years agoDoc - clarified that on Windows, for 32-bit programs running in WOW64
Kavindra Devi Palaraja [Wed, 15 Apr 2009 12:26:59 +0000 (14:26 +0200)]
Doc - clarified that on Windows, for 32-bit programs running in WOW64
      mode, the settings are stored in

Task-number: 232011
Reviewed-by: Martin Petersson <martin.petersson@trolltech.com>
(cherry picked from commit bbad83a64373b7e01f6abee98d854380f03aa6b6)

9 years agoPrevent crash in qt_scrollRectInImage.
Samuel Rødal [Wed, 15 Apr 2009 12:03:49 +0000 (14:03 +0200)]
Prevent crash in qt_scrollRectInImage.

Clip both against the source and target device rectangles.

Task-number: 247937
Reviewed-by: Trond
BT: yes
(cherry picked from commit 9da65ead69c92df717b1a63fe3c98c0cc73270f9)

9 years agoMy 4.5.1 changes.
Morten Sørvig [Wed, 15 Apr 2009 12:35:32 +0000 (14:35 +0200)]
My 4.5.1 changes.
(cherry picked from commit 4e9c2364e8e9580aa317e9387338d45207ac4baa)

9 years agoUpdate the item if the text has changed but the boundingRect is the
Alexis Menard [Wed, 15 Apr 2009 12:14:27 +0000 (14:14 +0200)]
Update the item if the text has changed but the boundingRect is the
updateBoudingRect update the item only if the boundingRect change
but if we have 123 as an initial text and then we set 321 as the new
text, then nothing happen because the rect is the same.
In case the boundingRect change then we call update 2 times but
the item is already dirty so the second call will just return.

Reviewed-by: Andreas
(cherry picked from commit 36b16a126e24cb8d8e5c34cfd807bc7c51ea49cf)

9 years agoBT: Updated configure for OpenGL ES 2.0 Windows CE
Friedemann Kleint [Wed, 15 Apr 2009 11:49:57 +0000 (13:49 +0200)]
BT: Updated configure for OpenGL ES 2.0 Windows CE
(cherry picked from commit 4cb80de7ade662deb5542f77cd3a36517fa9cd9b)

9 years agoReparenting QGLWidgets did sometimes caused warnings to be printed on
Trond Kjernåsen [Wed, 15 Apr 2009 11:34:09 +0000 (13:34 +0200)]
Reparenting QGLWidgets did sometimes caused warnings to be printed on

Check if the view is visible before attaching it to a context.

Task-number: related to 250066
Reviewed-by: Norwegian Rock Cat
BT: yes
(cherry picked from commit b646787cf0d67f4df00212f62a83432c641eae95)

9 years agoBT: Namespace compile fixes for Cocoa.
Norwegian Rock Cat [Wed, 15 Apr 2009 11:14:31 +0000 (13:14 +0200)]
BT: Namespace compile fixes for Cocoa.

It worked in 4.5.0, so it should work in 4.5.1 too.
(cherry picked from commit d7e8586e6ab009a6da1eb63aa6798d7c6a34c30d)

9 years agoMy changes
Jan-Arve Sæther [Wed, 15 Apr 2009 11:25:22 +0000 (13:25 +0200)]
My changes
(cherry picked from commit 869c85e2f965a226416f0a142572ff749b30ba9e)

9 years agoAdding the KNOWN.ISSUES file for 4.5.1, pre doc review.
Carlos Manuel Duclos Vergara [Wed, 15 Apr 2009 14:29:51 +0000 (16:29 +0200)]
Adding the KNOWN.ISSUES file for 4.5.1, pre doc review.

9 years agoDon't crash or loop infinitely when we retrieving the accessible accel.
Jan-Arve Sæther [Wed, 15 Apr 2009 08:12:34 +0000 (10:12 +0200)]
Don't crash or loop infinitely when we retrieving the accessible accel.

qt_accHotKey() was pretty buggy; it could both crash or spin forever
in some cases.

Task-number: 221731
Reviewed-by: alexis
(cherry picked from commit b33ebce3de3efd98a45c8ca0a349f78aac09c875)

9 years agoMy changes for 4.5.1
João Abecasis [Wed, 15 Apr 2009 09:01:24 +0000 (11:01 +0200)]
My changes for 4.5.1

BT: yes
(cherry picked from commit 61abefeb649fdbc4653bd69415431cabd640e4ce)

9 years agoMy ChangeLog.
Andreas Aardal Hanssen [Wed, 15 Apr 2009 10:45:09 +0000 (12:45 +0200)]
My ChangeLog.

Reviewed-by: Trust Me
(cherry picked from commit 8fc0d4ed0d306e131276ce6e4dd236ca42582d9a)

9 years agoCorrecting paragraph
Morten Engvoldsen [Wed, 15 Apr 2009 10:37:32 +0000 (12:37 +0200)]
Correcting paragraph

Made a mistake when pushing e0706ca2fbce063c263bad9a1eee24f057f170bd
I Corrected this.

Task-number: 250254
Rev-by: Frans Englich
Rev-by: Geir Vattekar
(cherry picked from commit 809b192f245f24e3e17655e4f5f335bee4bcad79)

9 years agoBT: OpenGL ES 2.0 now compiles properly for Windows CE
Thomas Hartmann [Wed, 15 Apr 2009 09:59:56 +0000 (11:59 +0200)]
BT: OpenGL ES 2.0 now compiles properly for Windows CE

glpixmapfilter should not be compiled for OpenGL ES 2.0 on nay platform

Reviewed-by: Tom Cooksey
(cherry picked from commit 9f6146dd3a7c111923e79c490c9504f39b205f0b)

9 years agoAdded remark about XML input
Morten Engvoldsen [Wed, 15 Apr 2009 10:27:05 +0000 (12:27 +0200)]
Added remark about XML input

Stated a remark about the need to use well-formed XML as input to the example.

Rev-by: Geir Vattekar
(cherry picked from commit e0706ca2fbce063c263bad9a1eee24f057f170bd)

9 years agoBT: Fix Cocoa bug w/OpenGL widgets in dock widgets would disappear.
Norwegian Rock Cat [Wed, 15 Apr 2009 10:11:39 +0000 (12:11 +0200)]
BT: Fix Cocoa bug w/OpenGL widgets in dock widgets would disappear.

The NSOpenGLContext seems to be tied to the window. So if the view
changes from one window to another, the OpenGL context needs to be
cleared. We can do this by hooking into the viewWillChangeWindow and
viewDidChangeWindow events and clear and reset the drawable
respectively. We also found out that QCocoaOpenGLView was not being used
at all, so just remove it to get rid of any confusion.

Task-number: 250066
Reviewed-by: Trond
(cherry picked from commit b4234ab3f4dbd8c7017d749888b2d8effd3c5983)

9 years agoBT: Fix a crash on certain theme changes in GNOME
Jens Bache-Wiig [Wed, 15 Apr 2009 10:08:35 +0000 (12:08 +0200)]
BT: Fix a crash on certain theme changes in GNOME

We did not update initGtkWidgets on theme changes which could
lead to crashes as the contents of the widget hash depend on
certain properties in the style. A simple way to reproduce this would
be to change between the redmond gtk theme and cleanlooks.

Task-number: 251115
Reviewed-by: paul
(cherry picked from commit a55f477b2a40b89e690fe6b61509cf665e96243b)

9 years agoBT: QAbstractSocket: fix check for closing state (typo)
Peter Hartmann [Wed, 15 Apr 2009 09:58:54 +0000 (11:58 +0200)]
BT: QAbstractSocket: fix check for closing state (typo)

emit disconnected() if we were in ConnectedState or in ClosingState

Reviewed-by: Thiago
Task-number: 250976
(cherry picked from commit 85db19b2eef0f7933fa28e8e5e1d365aab72458a)

9 years agoThe submenu of a multicolumn menu have an incorrect position
Thierry Bastian [Wed, 15 Apr 2009 09:51:17 +0000 (11:51 +0200)]
The submenu of a multicolumn menu have an incorrect position

The submenu would always appear to the side of the menu instead of its

Task-number: 250673
Reviewed-by: ogoffart
(cherry picked from commit 8f223e03effba1aef6be5e50caf7482af1d7dd8a)

9 years agoRevert "Fixup update rect regression by adjusting expose rectangles."
Jason McDonald [Wed, 15 Apr 2009 10:39:09 +0000 (20:39 +1000)]
Revert "Fixup update rect regression by adjusting expose rectangles."

This reverts commit 66fe4167b123c644874216af4f1c1a2fb3c478b2.
Oops, missed the bit in the comment about not fixing for a 4.5 patch

9 years agoBT: compilefix for Qt in namespace
Thomas Hartmann [Tue, 7 Apr 2009 13:04:31 +0000 (15:04 +0200)]
BT:   compilefix for Qt in namespace

RevBy:    mauricek

Details:  using prefix qt_  instead of ::global namespace
(cherry picked from commit 9904f77b26d3b75f8ed53e82c14ff8e9baf710dc)

9 years agoBT: Fix a regression to 4.4 in Graphics View's handling of child clippers
Andreas Aardal Hanssen [Wed, 15 Apr 2009 08:23:08 +0000 (10:23 +0200)]
BT: Fix a regression to 4.4 in Graphics View's handling of child clippers

Regression caused by optimizations in QGraphicsItem and QGraphicsScene.
The changes in QGraphicsItem fix bugs in QGraphicsItem::mapToParent
functions, which did the translation before applying the transformation,
instead of the other way (transform, then translate). This bug caused
almost all mapToParent and mapRectToParent functions to behave wrongly.
Unfortunately the new helper functions in QGraphicsScene for discovering
items made use of these functions, which introduced a regression. Fixing
these functions also fixes item discovery.

The other part of this change fixes a regression caused by c1909321,
which luckily happened after 4.5.0 and never saw the light of day. The
fix is to also invalidate the cached clip path even if there is no scene,
which is necessary if you build your scene graph outside the scene, and
finish off by adding the root item to the scene.

Task-number: 250680
Reviewed-by: Alexis
(cherry picked from commit 7a0f9ae94ca7a47dc285431d31f6839c07870194)

9 years agoQGraphicsView: Rubber Band drag mode not updated correctly when scrolling [regression]
Alexis Menard [Tue, 14 Apr 2009 16:01:26 +0000 (18:01 +0200)]
QGraphicsView: Rubber Band drag mode not updated correctly when scrolling [regression]
The problem was that we didn't update the new region when we paint the
rubber band and we scroll at the same time
Task-number: 245766
Reviewed-by: bnilsen
Reviewed-by: andreas
(cherry picked from commit 0f6950e11389a3ddf657116a98ee8f4ec0753eb4)

9 years agoFixup update rect regression by adjusting expose rectangles.
Andreas Aardal Hanssen [Mon, 6 Apr 2009 11:31:02 +0000 (13:31 +0200)]
Fixup update rect regression by adjusting expose rectangles.

This change shows a limitation in Graphics View caused by QPen's
default width being 0 (cosmetic), while Graphics View actually
does not support cosmetic pens at all. Because items are at risk of
drawing lines that poke 1 pixel outside their bounding rect,
QGraphicsView must look for items that are up to one pixel
larger than their bounding rect mapped to viewport coordinates.

Furthermore, mapToScene(QRect) forces us to adjust the
input rectangle by (0, 0, 1, 1), because it uses QRect::bottomRight()
(etc) when mapping the rectangle to a polygon (which is _wrong_). Since
this behavior has been there since 4.2, we don't want to fix it in
a 4.5 patch release...

The only _proper_ fix to this problem is for the view to know the item's
"adjust" in device coordinates, allowing items to use cosmetic pens
freely. Fex, we could introduce QGraphicsItem::viewportMargins() or so.

Added an autotest to ensure this doesn't break again.

Reviewed-by: bnilsen
(cherry picked from commit cc18633fe45d599bfeac2a8b2737d155f1dd5564)

9 years agoFixes: Wrong adjustment of rect added in 0aa2ef27249dc8e782c2942340776bb19de80a0d
Bjoern Erik Nilsen [Fri, 3 Apr 2009 14:52:10 +0000 (16:52 +0200)]
Fixes:    Wrong adjustment of rect added in 0aa2ef27249dc8e782c2942340776bb19de80a0d

RevBy:    TrustMe
AutoTest: tst_QGraphicsItem::boundingRegion() pass again
Details:  The original code adjusted the QRect version of a mapped bounding rect,
          wheras my patch adjusted a mapped bounding rect (QRectF) and then
          converted it to a QRect.
(cherry picked from commit 416fd77e653d089b7832002a68d5b7725fa492db)

9 years agoFixes: We have to adjust the item's bounding rect.
Bjoern Erik Nilsen [Fri, 3 Apr 2009 14:39:58 +0000 (16:39 +0200)]
Fixes:    We have to adjust the item's bounding rect.

RevBy:    Andreas
AutoTest: Still pass
Details:  QRectF::intersects does not work with flat rectangles, so
          we cannot intersect the bounding rect without adjusting it
(cherry picked from commit 3dc62362f3380fa653bc1225ce06e5e4cefa745a)

9 years agoFixes: Optimize the way we adjust rectangles.
Bjoern Erik Nilsen [Fri, 3 Apr 2009 09:47:59 +0000 (11:47 +0200)]
Fixes:    Optimize the way we adjust rectangles.

RevBy:    Olivier
AutoTest: Still pass
(cherry picked from commit 32767aa5699937a3737b9515f4f82acc04ccdfcd)

9 years agoFixes: Partially revert 9b0af2395c84a6895a5ce6368f151d4ec00c8755
Bjoern Erik Nilsen [Wed, 1 Apr 2009 09:25:01 +0000 (11:25 +0200)]
Fixes:    Partially revert 9b0af2395c84a6895a5ce6368f151d4ec00c8755

RevBy:    Andreas
AutoTest: tst_QGraphicsView::itemAt2 pass again
Details:  A QPoint in the view has to be mapped to a pixel in the
          scene, otherwise it won't be possible to e.g. click
          on items that are smaller than a pixel.

          So...we have to optimize the hit-testing code in another way
(cherry picked from commit 79799ec4788692d44862832d85f80953d386cb27)

9 years agoFixes: Minimize QVariant overhead related to QGraphicsItem::itemChange.
Bjoern Erik Nilsen [Tue, 31 Mar 2009 12:58:15 +0000 (14:58 +0200)]
Fixes:    Minimize QVariant overhead related to QGraphicsItem::itemChange.

RevBy:    Andreas
AutoTest: included
(cherry picked from commit d516e5fbed3a7eac20229ead34221c732f85cdb6)

9 years agoOptimise QPainterPath::contains(QPointF)
Lars Knoll [Fri, 27 Mar 2009 21:18:47 +0000 (22:18 +0100)]
Optimise QPainterPath::contains(QPointF)

We can shortcut quite some calculations for the common case
by first checking whether the point is contained in the
control point rect.
(cherry picked from commit bc3d96a902d16a9bb358c05de9f6bfede3594731)

9 years agoOptimise QGraphicsScene/View::items(const QPointF &pos)
Lars Knoll [Fri, 27 Mar 2009 21:17:10 +0000 (22:17 +0100)]
Optimise QGraphicsScene/View::items(const QPointF &pos)

Implement specialized (and more efficient versions) of item_helper()
and child_helper() that test for QPointF in the scene.
(cherry picked from commit 30d01c387179160c8c418ecedfb4506a55d282e8)

9 years agoFixes: Simplify the cut-offs and be more agressive :-)
Bjoern Erik Nilsen [Fri, 27 Mar 2009 17:53:02 +0000 (18:53 +0100)]
Fixes:    Simplify the cut-offs and be more agressive :-)

AutoTest: Still pass.
Details:  It's easier to read and understand the code now.
(cherry picked from commit 73ce29e6bc09651a4e70b5e61c36d56e568905c7)

9 years agoFixes: Discard update requests if possible.
Bjoern Erik Nilsen [Tue, 24 Mar 2009 14:50:26 +0000 (15:50 +0100)]
Fixes:    Discard update requests if possible.

AutoTest: Still pass.
Details:  Update requests can be discarded if the item itself is
          clipped away and the item clips all its children to shape.

          This cut-off is extremely effective (and aggressive:))
(cherry picked from commit 23c73210fc79055f4bac44de0e43f9917f8d0e7f)

9 years agoFixes: Don't bother updating hidden items.
Bjoern Erik Nilsen [Thu, 26 Mar 2009 16:16:36 +0000 (17:16 +0100)]
Fixes:    Don't bother updating hidden items.

AutoTest: Still pass
(cherry picked from commit d85835580463f88df6a71d27d2577739e5366f68)

9 years agoFixes: Do not update children if not required.
Bjoern Erik Nilsen [Thu, 26 Mar 2009 16:05:59 +0000 (17:05 +0100)]
Fixes:    Do not update children if not required.

AutoTest: Still pass
(cherry picked from commit 15098c5ec73db5de8ca724f744a1484f888ed271)

9 years agoFixes: Don't check the force boolean.
Bjoern Erik Nilsen [Thu, 26 Mar 2009 15:48:48 +0000 (16:48 +0100)]
Fixes:    Don't check the force boolean.

Details:  It's clipped away regardless.
(cherry picked from commit 5564ef89f46fe96aa0b22b888a9a8ba053eea6c7)

9 years agoFixes: Minimize QVariant constr/destr in setPosHelper.
Bjoern Erik Nilsen [Wed, 25 Mar 2009 12:41:10 +0000 (13:41 +0100)]
Fixes:    Minimize QVariant constr/destr in setPosHelper.

RevBy:    TrustMe
(cherry picked from commit a914eb155e085ba0efa5b95154bf7345d4be7cd7)

9 years agoFixes: Optimize QGraphicsViewPrivate::itemUpdated.
Bjoern Erik Nilsen [Wed, 25 Mar 2009 11:38:35 +0000 (12:38 +0100)]
Fixes:    Optimize QGraphicsViewPrivate::itemUpdated.

AutoTest: Still pass
Details: Get rid of QTransform::inverted()/operator*= and do
         nothing if the item clips all its children and the update
         rect is outside the bounding rect.
(cherry picked from commit 9ed299a3edba92791e1c5af64b8fd9c9fe74c0ea)

9 years agoFixes: Discard update requests if possible.
Bjoern Erik Nilsen [Tue, 24 Mar 2009 14:50:26 +0000 (15:50 +0100)]
Fixes:    Discard update requests if possible.

AutoTest: Still pass.
Details:  Update requests can be discarded if the item itself is
          clipped away and the item clips all its children to shape.

          This cut-off is extremely effective (and aggressive:))
(cherry picked from commit 0d959a6c402ea3a3a55d7076d453d4bdbf8dce8e)

9 years agoFixes: Don't bother processing items that are clipped away.
Bjoern Erik Nilsen [Mon, 23 Mar 2009 18:37:41 +0000 (19:37 +0100)]
Fixes:    Don't bother processing items that are clipped away.

RevBy:   Andreas
(cherry picked from commit deccc867b244fbc52ca58e21623febbc27310b05)

9 years agoFixes: Optimization: Clip path is empty if the bounding rect is empty.
Bjoern Erik Nilsen [Mon, 23 Mar 2009 14:54:30 +0000 (15:54 +0100)]
Fixes:    Optimization: Clip path is empty if the bounding rect is empty.

RevBy:    TrustMe
(cherry picked from commit 95fa7a93bc840e0f49ee30e76abb2b4f8579c997)

9 years agoFixes: Clever invalidating of the cached clip path.
Bjoern Erik Nilsen [Fri, 20 Mar 2009 17:06:05 +0000 (18:06 +0100)]
Fixes:    Clever invalidating of the cached clip path.

RevBy:    Andreas
AutoTest: still pass
Details:  Adds emptyClipPath bit, a cut-off to test if the item
has an empty clip path (i.e., is clipped away). Also adds
code for invalidating the cache from inside setPos().
(cherry picked from commit c1909321a486621ef196dd4bb3cf354406d86d46)