summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Potential crash when adding items from QGraphicsWidget::polishEvent().Bjørn Erik Nilsen2010-01-223-18/+68
| | | | | | | | | | | These were processed immediately, so there was a fair chance that we could end up doing a virtual function call on items that were not fully constructed. This patch is also an optimization, since we never remove anything from the vector. Auto-test included. Reviewed-by: Jan-Arve
* QGraphicsWidget is painted twice on the inital show.Bjørn Erik Nilsen2010-01-224-8/+43
| | | | | | | | | | | | | Problem occured when doing something in the polishEvent() which eventually ended up as an update(). The problem was that in QGraphicsScene::addItem we scheduled a polish event after scheduling an update, resulting in update requests being processed before polish requests. Auto-test included. Task-number: QTBUG-6956 Reviewed-by: alexis
* Fix QPainter::redirection() to pass autotest.Gunnar Sletta2010-01-221-3/+2
| | | | Reviewed-by: Trond
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-22162-1120/+2301
|\
| * Re-added the Close button in QPrintPreviewDialog for Mac/Carbon.Trond Kjernåsen2010-01-221-0/+10
| | | | | | | | | | | | | | | | | | Modal Mac/Carbon dialogs do not have the close, minimize and resize window title buttons enabled, which makes it very hard to close modal dialogs. Task-number: QTBUG-7481 Reviewed-by: Kim
| * revert parts of 10392eef4fd4f9Joerg Bornemann2010-01-221-26/+24
| | | | | | | | | | | | We can't call QCOMPARE from within a nested function, because the return statement will just exit that function. VERIFY_COLOR can't be turned into a function this way.
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-226-9/+10
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-2219-451/+584
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix rendering with simple shader in GL2 engine removed a debug trace Fix documentation bug in QColor Don't use a mutex lock in QPainter::redirection unless strictly required Only send QGraphicsItem::ParentChange(d) notifications from setParentItem. Pass value as const void *const to QGraphicsSceneIndex::itemChange. Optimize QGraphicsItem::setFlags. Optimize QGraphicsScenePrivate::itemAcceptsHoverEvents_helper Improve performance of QGraphicsItem::setParentItem. Make sure cursor is painted at the correct position when we are using IM. Purely cosmetic (formatting) changes to GL2 engine's GLSL Use an attribute value for the PMV matrix rather than a uniform Remove unnecessary depth uniform from GL2 engine's GLSL Doc fixes: Remove some lies from QEasingCurve. Fix how we select antialiasing method for text under Mac OS X
| | | * Fix rendering with simple shader in GL2 engineTom Cooksey2010-01-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to bind the PMV matrix's attributes to their indexes in the simple shader, which is created in a seperate code path to all the other shaders. This should fix the qgl autotest failures. Reviewed-By: TrustMe
| | | * removed a debug traceThierry Bastian2010-01-221-2/+0
| | | |
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-224-7/+7
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Assistant docs: Fix link. QtHelp docs: Fix illegal namespace name. Assistant: Set correct mime type for text documents.
| | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-224-7/+7
| | | |\ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Assistant docs: Fix link. QtHelp docs: Fix illegal namespace name. Assistant: Set correct mime type for text documents.
| | | * | Assistant docs: Fix link.ck2010-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4607 Reviewed-by: David Boddie
| | | * | QtHelp docs: Fix illegal namespace name.ck2010-01-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5908 Reviewed-by: kh1
| | | * | Assistant: Set correct mime type for text documents.ck2010-01-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6796 Reviewed-by: kh1
| * | | | Fix y-inverted pixmaps properly.Gunnar Sletta2010-01-221-9/+5
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a lot of code depending on that pixmaps are flipped upside down in the gl graphicssystem, so toggling this requires extensive testing. Since we're anyway questioning the relevance of this feature (compared to raster + GL viewport) its simply not worth the effort to fix it properly right now. Revert "Fixed y-inverted pixmaps on N900." This reverts commit 57473d5d2a7bd6ae3117f61ff29264a1b790bb01.
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-2285-678/+1255
| |\ \ \
| | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-2216-439/+541
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Only send QGraphicsItem::ParentChange(d) notifications from setParentItem. Pass value as const void *const to QGraphicsSceneIndex::itemChange. Optimize QGraphicsItem::setFlags. Optimize QGraphicsScenePrivate::itemAcceptsHoverEvents_helper Improve performance of QGraphicsItem::setParentItem. Make sure cursor is painted at the correct position when we are using IM. Purely cosmetic (formatting) changes to GL2 engine's GLSL Use an attribute value for the PMV matrix rather than a uniform Remove unnecessary depth uniform from GL2 engine's GLSL Doc fixes: Remove some lies from QEasingCurve. Fix how we select antialiasing method for text under Mac OS X
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-2116-439/+541
| | | |\ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Only send QGraphicsItem::ParentChange(d) notifications from setParentItem. Pass value as const void *const to QGraphicsSceneIndex::itemChange. Optimize QGraphicsItem::setFlags. Optimize QGraphicsScenePrivate::itemAcceptsHoverEvents_helper Improve performance of QGraphicsItem::setParentItem. Make sure cursor is painted at the correct position when we are using IM. Purely cosmetic (formatting) changes to GL2 engine's GLSL Use an attribute value for the PMV matrix rather than a uniform Remove unnecessary depth uniform from GL2 engine's GLSL Doc fixes: Remove some lies from QEasingCurve. Fix how we select antialiasing method for text under Mac OS X
| | | | * Only send QGraphicsItem::ParentChange(d) notifications from setParentItem.Bjørn Erik Nilsen2010-01-213-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QmlGraphicsItem doesn't need any parent change notifactions so we can call the helper class (QGraphicsItemPrivate::setParentItemHelper) direclty from QmlGraphicsItem::setParentItem. This avoids a lot of unnecessary instructions related to QVariant constructions as well as virtual function calls. I've made the variant pointers explicit in the declaration of setParentItemHelper so that we don't accidentally call setParentItemHelper from places where we need parent change notifications. Task-number: QTBUG-6877 Reviewed-by: alexis
| | | | * Pass value as const void *const to QGraphicsSceneIndex::itemChange.Bjørn Erik Nilsen2010-01-215-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need this change in order to bypass some of the QVariant itemChange notifications from QGraphicsItem::setParentItem. All this is internal stuff and we know what we do, so I don't consider the change too ugly. Task-number: QTBUG-6877 Reviewed-by: alexis
| | | | * Optimize QGraphicsItem::setFlags.Bjørn Erik Nilsen2010-01-211-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't have to do a full blown QGraphicsItem::setFlag call from QGraphicsItem::setFlags, only to change the ItemStacksBehindParent bits. We can do it directly (with care). Task-number: QTBUG-6877 Reviewed-by: alexis
| | | | * Optimize QGraphicsScenePrivate::itemAcceptsHoverEvents_helperBjørn Erik Nilsen2010-01-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we do cheap tests before the more expensive ones. This function is called from QGraphicsScene::addItem. Task-number: QTBUG-6877 Reviewed-by: alexis
| | | | * Improve performance of QGraphicsItem::setParentItem.Bjørn Erik Nilsen2010-01-213-35/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The biggest optimization here is "updateAncestorFlags()". It's much faster to update all the flags rather than trying to enable/disable certain flags according to the current state. Task-number: QTBUG-6877 Reviewed-by: alexis
| | | | * Make sure cursor is painted at the correct position when we are using IM.Jan-Arve Sæther2010-01-212-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the line edit was refactored into a line control this regression was introduced. This regression was introduced by change fb7d86cf23227302d48db279ec589221d11a1f6a. Task-number: QTBUG-4789 Reviewed-by: Alan Alpert
| | | | * Purely cosmetic (formatting) changes to GL2 engine's GLSLTom Cooksey2010-01-211-333/+357
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes GLSL dumps _significantly_ easier to read. Reviewed-By: TrustMe
| | | | * Use an attribute value for the PMV matrix rather than a uniformTom Cooksey2010-01-215-31/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has several advantages: First, updating an attribute value seems to be cheaper than updating a uniform. Second, vertex atribute values are independent of shader program, which means they persist across changing of the shader program. This makes code simpler and reduces GL state changes. Note: Credit goes to Samuel for finding this little gem. :-) For the 25920 solid QGraphicsRectItem test case, this gives 10% improvement on desktop and 27% on the SGX. Reviewed-By: Kim
| | | | * Remove unnecessary depth uniform from GL2 engine's GLSLTom Cooksey2010-01-211-6/+0
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Samuel
| | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2010-01-2128-84/+331
| | | | |\
| | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-219073-13996/+21198
| | | | | |\
| | | | | * | Fix how we select antialiasing method for text under Mac OS XGunnar Sletta2010-01-211-11/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Eskil
| | | | * | | Doc fixes: Remove some lies from QEasingCurve.Jan-Arve Sæther2010-01-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7418
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-2220-43/+116
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QSslSocket: Take better care on how we use the SSL buffers Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8f5ca3ba5da63a47d4f90bbd867d3e8453443dd3 ) Revert "Make an empty QUrl also be considered non-detached (d == 0)." SSL Certificate: don't crash when the END CERTIFICATE line ends without CRLF doc: Documented the return value for QDomNode::appendChild(). QNAM HTTP: make it give some better error messages in case of socket failure. qUncompress: Fix terminating \0 Add qttracereplay.exe to gitignore Fix missing focus rect for check and radio buttons in some GTK+ themes
| | | * | | | | QSslSocket: Take better care on how we use the SSL buffersMarkus Goetz2010-01-211-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .. and breaking out of a loop where we should. Reviewed-by: thiago
| | | * | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-214-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 8f5ca3ba5da63a47d4f90bbd867d3e8453443dd3 ) Changes in WebKit/qt since the last update: * Girish: Fix positioning of ComboBox popup in QGraphicsWebView. -- https://bugs.webkit.org/show_bug.cgi?id=33887
| | | * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-2113-30/+41
| | | |\ \ \ \ \
| | | | * | | | | Revert "Make an empty QUrl also be considered non-detached (d == 0)."Thiago Macieira2010-01-212-21/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as agreed with Warwick. This reverts commit 089ee7094eabb2058b478f5d2f306a69f6c0b3bf.
| | | | * | | | | SSL Certificate: don't crash when the END CERTIFICATE line ends without CRLFThiago Macieira2010-01-215-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the file/data ends in the END CERTIFICATE line without a newline, the certificate is still valid. If it's followed by anything other than a newline, then it's no longer valid. Also add another test for the BEGIN CERTIFICATE ending without newline, to ensure we don't crash there either. Reviewed-By: Peter Hartmann
| | | | * | | | | QNAM HTTP: make it give some better error messages in case of socket failure.Thiago Macieira2010-01-213-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Peter Hartmann
| | | | * | | | | qUncompress: Fix terminating \0Markus Goetz2010-01-212-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 6666 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | | | * | | | | Add qttracereplay.exe to gitignoreMarkus Goetz2010-01-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * | | | | | doc: Documented the return value for QDomNode::appendChild().Martin Smith2010-01-211-4/+8
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7498
| | | * | | | | Fix missing focus rect for check and radio buttons in some GTK+ themesJens Bache-Wiig2010-01-211-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some themes such as Nodoka does not draw a focus rect but instead reads the focus flag on the widget itself. Hence we have to set this flag before drawing. Task-number: QTBUG-7504 Reviewed-by: thorbjorn
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-2112-57/+141
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Update symbian def files Merge from upstream Merge from upstream Fix pro file error affecting windows builds Merge TRK client changes from upstream (QtCreator)
| | | * | | | | Update symbian def filesShane Kearns2010-01-216-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 5464cee529a26832517607b764e805bef96ea9f1 changes 3 private class symbols. Reviewed-by: Trust Me
| | | * | | | | Merge from upstreamShane Kearns2010-01-213-23/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch accepted upstream has the signal and slot renamed, so there is a corresponding change to main.cpp commit 53c672fb9853fef5a00285213084f02a4253e5f3 Author: Friedemann Kleint <Friedemann.Kleint@nokia.com> Date: Thu Jan 21 15:45:40 2010 +0100 trk: Handle TrkNotifyStopped in launcher. Add signal and static utility functions to parse message. Reviewed-by: Robert Loehning <robert.loehning@nokia.com> Initial-patch-by: Shane Kearns <shane.kearns@sosco.com> Task-number: QTBUG-7444
| | | * | | | | Merge from upstreamShane Kearns2010-01-213-22/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch accepted upstream changed a parameter from QString to QStringList. So there is a corresponding change to main.cpp to use the new API. commit b1291ecfd0ab31c41783feb645c98ce42fa87aae Author: Friedemann Kleint <Friedemann.Kleint@nokia.com> Date: Thu Jan 21 12:33:34 2010 +0100 trk: Add support for command line arguments in trk::Launcher. Initial-patch-by: Shane Kearns <shane.kearns@sosco.com> Task-number: QTBUG-7444
| | | * | | | | Fix pro file error affecting windows buildsShane Kearns2010-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: axis
| | | * | | | | Merge TRK client changes from upstream (QtCreator)Shane Kearns2010-01-212-5/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 1b77161e7183cdd4b5493698b4cddc727468f0f5 Author: hjk <qtc-committer@nokia.com> Date: Fri Jan 15 12:01:26 2010 +0100 debugger: clean up verbosity settings in trk adapter commit 4d7341becac684f5feb908e45d8b1756b4823c20 Author: hjk <qtc-committer@nokia.com> Date: Wed Jan 13 14:48:29 2010 +0100 debugger: whitespace commit d3cdfe813444b6afca483c7d13ac80c4c8eda62b Author: hjk <qtc-committer@nokia.com> Date: Wed Jan 13 14:46:13 2010 +0100 debugger: add some debug output to trk device commit 7cd27f2eecd5f77bc35f6b705c6f0422b09e534d Author: hjk <qtc-committer@nokia.com> Date: Mon Jan 4 13:17:38 2010 +0100 debugger: add list of thread ids to TRK session state object Reviewed-by: Shane Kearns
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-2110-62/+107
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: QtHelp: Enable dynamic translation. Designer: Fixed a crash when previewing in a non-existent style. uic3: Introduced option to preserve layout object names of Designer 3.
generated by cgit v0.12 at 2025-01-20 06:27:39 (GMT)