summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sami Merilä2009-09-283-13/+28
|\
| * Fix tst_QTextDocument::cursorPositionChangedOnSetTextmae2009-09-281-7/+3
| | | | | | | | | | | | | | | | | | | | The test was introduced to make sure that the cursor position changed signal was not emitted excessively on setPlainText or on setHtml. The original fix however still included one superfluous emission for a temporary QTextCursor object. This was fixed by change 930ba91ec1e630, this change adjusts the auto test accordingly. Reviewed-by: Simon Hausmann
| * Impossible to interact with the year on QCalendarWidget on GraphicsViewThierry Bastian2009-09-281-5/+15
| | | | | | | | | | | | | | | | | | The problem is that it is using mapToGlobal to translate a mouse position andthat doesn't work well when the widget is mebedded inside graphics view. Task-number: QT-2218 Reviewed-by: Bjoern Erik Nilsen
| * Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-2818-240/+250
| |\
| * | Fixed QMessageBox::updateSize test case for S60.Janne Anttila2009-09-281-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In S60 message boxes are always in portrait mode located on the bottom of screen and they occypy the whole sreen width. In addition messageboxes in S60 does not have their own buttons, but the buttons are located in system softkey area. That's why adding standard buttons for message box in S60 does not change the dialog size. Reviewed-by: Sami Merila
* | | Triggering softkey action for disbled widget causes a crash.Sami Merilä2009-09-283-2/+24
| |/ |/| | | | | | | | | | | | | | | | | Softkey actions need to copy enable state from action widget to prevent crash when action is triggered and action widget is disabled. OPEN: dynamically setting enable state for softkey actions. Task-number: QT-2117 Reviewed-by: Jason Barron
* | Merge branch '4.6' of git@scm.dev-nokia.troll.no:qt/qt into 4.6Andreas Aardal Hanssen2009-09-283-2/+4
|\ \
| * | Fix qdoc error.Jason McDonald2009-09-281-1/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Fix qdoc errorJason McDonald2009-09-281-1/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-09-282-4/+4
| |\ \
| * | | Fix qdoc errorsJason McDonald2009-09-281-0/+2
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | Merge commit 'origin/4.5' into 4.6Andreas Aardal Hanssen2009-09-2811-228/+165
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Joao Conflicts: src/gui/graphicsview/qgraphicsview.cpp src/gui/widgets/qspinbox.cpp tests/auto/qgraphicsview/tst_qgraphicsview.cpp
| * | | QGraphicsItem with parent flag ItemClipsChildrenToShape not visibleAndreas Aardal Hanssen2009-09-282-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression against Qt 4.4. Children of items with ItemClipsChildrenToShape would only be discovered if the view's expose region contained the outer bounding rect of all items, _if_ there was at least one item in the scene that enabled ItemIgnoresTransformations. The reason for this bug is that the presence of an untransformable item causes the item lookups to go through a different path (QGraphicsViewPrivate::itemsInArea()). This function had the bug that it didn't correctly discover children of clip-items. Because of this, in the provided test case you could "work around" the bug by either removing the clip flag, or the transformation flag. Task-number: QTBUG-4151 Reviewed-by: Alexis
| * | | Some of my 4.5.3 changesMarkus Goetz2009-09-281-0/+15
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | my changes for 4.5.3 addedJoerg Bornemann2009-09-281-1/+1
| | | |
| * | | Cocoa: Fix build cocoa port with namespaceRichard Moe Gustavsen2009-09-283-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | This fix just fixes up coding bugs here and there Reviewed-by: Brad
| * | | Updated change log for 4.5.3João Abecasis2009-09-281-0/+14
| | | |
| * | | Doc: fixed typo in QTabBar::tabRect() docsStian Sandvik Thomassen2009-09-281-1/+1
| | | |
| * | | Fixes: better wording.Bill King2009-09-281-1/+1
| | | |
| * | | Added test for QTBUG-4595.Stian Sandvik Thomassen2009-09-281-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QDomDocument::toString() should not cause an assertion if the document specifies an encoding that is not supported by QTextCodec. Task-number: QTBUG-4595
| * | | Update dist/changes-4.5.3 for sql changes.Bill King2009-09-281-1/+14
| | | |
| * | | Fixes a crash in QDoubleSpinBoxJoão Abecasis2009-09-253-222/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing dubious intermediate detection code that also had a buffer overflow. The results were inconsistent and not dependable on. Processing was inefficient and end value to user experience dubious. Test cases that abused the former behaviour were changed to consider input in an Intermediate where it was previously considered Invalid. With this change, user input will mostly be considered in an intermediate state, until it is effectively validated. Task-number: 255019 Reviewed-by: Anders Bakken
| * | | Change log updatePrasanth Ullattil2009-09-251-1/+10
| | | | | | | | | | | | | | | | Reviewed-by: Trust me
| * | | QHostAddress: Clarification about DNSMarkus Goetz2009-09-251-0/+3
| | | | | | | | | | | | | | | | Task-number: QT-1683
* | | | Updated JavaScriptCore from /home/khansen/dev/qtwebkit to ↵Kent Hansen2009-09-282-4/+4
| |/ / |/| | | | | | | | jsc-for-qtscript-4.6-staging-28092009 ( b98dec961e9389ddd5e10d7c4086de9a297cb984 )
* | | add a test for custom QEventTransitionKent Hansen2009-09-281-3/+74
| | | | | | | | | | | | | | | Test that the event has the right attributes. Also improve the custom QSignalTransition test to cover all attributes.
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-09-2849-313/+246
|\ \ \ | | |/ | |/|
| * | Document that scope unix is true for Symbian platform.Frans Englich2009-09-281-0/+2
| | | | | | | | | | | | | | | Task-number: QTBUG-2989 Reviewed-by: Jason Barron
| * | Make the test pass on both large and small screens.Paul Olav Tvete2009-09-281-10/+10
| | | | | | | | | | | | Reviewed-by: Joerg
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Janne Koskinen2009-09-2848-302/+234
| |\ \
| | * | Deep copy QImage based on non-owned data so we can safely store themGunnar Sletta2009-09-281-2/+11
| | | | | | | | | | | | | | | | Reviewed-by: Samuel
| | * | Make QSignalEvent and QWrappedEvent inner classes of QStateMachineKent Hansen2009-09-2818-230/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those two classes are specific to the state machine framework, but their names were so generic that we felt they were polluting the Q-namespace. They are now QStateMachine::SignalEvent and QStateMachine::WrappedEvent. Reviewed-by: Eskil Abrahamsen Blomfeldt
| | * | Fixed unwanted recursion when calling openGLVersionFlags().Kim Motoyoshi Kalland2009-09-281-1/+2
| | | | | | | | | | | | | | | | Reviewed-by: Gunnar
| | * | Remove doc warning about UpdateSoftKeys.Jason Barron2009-09-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qdoc was giving attitude about this undocumented event type so mark it as omitted in the documentation. Task-number: QTBUG-4601 Reviewed-by: TrustMe
| | * | QEventLoop::ExcludeUserInputEvents should not allow the user to close the windowBradley T. Hughes2009-09-283-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These types of input events are not handled by the normal mouse and key event handlers on X11 and Windows. Add special cases for them to make sure that they are not delivered while ExcludeUserInputEvents is set. Task-number: QTBUG-4242 Reviewed-by: Simon Hausmann
| | * | Fixed qsharedpointer auto test build break for Symbian OS.Janne Anttila2009-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | RVCT has problems with scoping, the similar workaround has been used in qhash.h also. Reviewed-by: Janne Koskinen
| | * | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-2811-14/+69
| | |\ \
| | | * | compile fix with namespaced qthjk2009-09-287-11/+15
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Simon Hausmann
| | | * | compile fix with namespacehjk2009-09-282-0/+9
| | | | | | | | | | | | | | | | | | | | Reviewed-by: sroedal
| | | * | Make sure the correct soft key is triggered.Jason Barron2009-09-282-3/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cases where there are both softkey actions as well as "normal" actions, we need to be sure to skip over the none softkey actions since they should not be a part of the softkey framework and the 'index' will be out of sync. Reviewed-by: Sami Merila
| | * | | Fixed qsharedmemory autotest compile break for Symbian OSJanne Anttila2009-09-282-3/+10
| | |/ / | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-2813-54/+52
| | |\ \
| | | * | doc: Fixed three /sa that should be \saThorbjørn Lindeijer2009-09-283-3/+3
| | | | |
| | | * | Stabilize some more testsOlivier Goffart2009-09-287-43/+35
| | | | |
| | * | | Fixed style dependent failures for S60 in QGraphicsLinearLayout test.Janne Anttila2009-09-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since S60 does not compile QPlastiqueStyle, we use QWindowsStyle Reviewed-by: TrustMe
| * | | | Webcore build break on Symbian fixJanne Koskinen2009-09-281-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepending adds epoc32\include too early into generated systeminclude path search order causing Webcore build to break due to wrong animation.h header getting included. Reviewed-by: Jason Barron
* | | | | Fix qdoc error.Jason McDonald2009-09-281-2/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | Fix qdoc error.Jason McDonald2009-09-281-1/+1
| |_|/ / |/| | | | | | | | | | | Reviewed-by: Trust Me
* | | | Fix qdoc error.Jason McDonald2009-09-281-1/+1
|/ / / | | | | | | | | | Reviewed-by: Trust Me
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-09-2812-31/+122
|\ \ \