summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6'Thiago Macieira2009-12-0813-32/+84
|\
| * Fix cleanup hooks error.Sarah Smith2009-12-081-2/+2
| | | | | | | | | | | | | | Trying to fix QTBUG-6563, getting crash from cut-n-paste slippage, now fixed. Task-number: QTBUG-6563 Reviewed-by: Rhys Weatherley
| * Update source package names in documentation.Jason McDonald2009-12-082-10/+10
| | | | | | | | | | Task-number: QTBUG-6574 Reviewed-by: Trust Me
| * Merge remote branch 'staging/4.6' into 4.6Oswald Buddenhagen2009-12-077-13/+43
| |\
| | * make qdoc3 a proper tools subtarget and install itOswald Buddenhagen2009-12-043-4/+5
| | | | | | | | | | | | | | | | | | needed for building qtmobility and qtcreator docs without magic. Reviewed-by: Daniel Molkentin
| | * remove dead fileOswald Buddenhagen2009-12-041-5/+0
| | |
| | * Fix cursor positiong after block undo and redomae2009-12-041-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Block changes in different selections happens quite frequently with Qt Creator, e.g. when renaming local variables. The desired behaviour which the tst_QTextCursor::cursorPositionWIthBLockUndoAndRedo() tests, is like this: after an undo, the cursor should be where it was when the block operation started. After a redo, the cursor should be where it was after the block operation ended. Reviewed-by: Simon Hausmann
| | * Added auto test for the cursor position when doing block undo and redomae2009-12-041-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | Block changes in different selections happens quite frequently with Qt Creator, e.g. when renaming local variables. This test tests the desired cursor position behaviour: after an undo, the cursor should be where it was when the block operation started. After a redo, the cursor should be where it was after the block operation ended.
| | * Stylesheets example: Fix warning about multiple &-mnemonics.Friedemann Kleint2009-12-041-1/+1
| | | | | | | | | | | | Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-12-062-6/+2
| |\ \
| | * | Replace glColor4ub() calls with glColor4f()Rhys Weatherley2009-12-062-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Intel Q45/Q43 Express Chipset has problems with glColor4ub() not updating GL_CURRENT_COLOR correctly. Replace all references with calls to glColor4f() instead as it is more likely to be implemented correctly on all chipsets. Task-number: QTBUG-6217 Reviewed-by: Sarah Smith
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Bill King2009-12-0663-401/+1005
| |\ \ \
| * | | | Revert previous commit as it breaks an sqlite assumption.Bill King2009-12-041-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During the exe(), sqlite does it's first stepping, and stores that into the cache. It assumes that that value is still in the cache when fetchNext() is called, and uses the "cached" value to return.
| * | | | Fixes: QOCI setForwardOnly(true) accumulating values.Bill King2009-12-042-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | readPiecewise() is assuming an empty valueCache when reading a new row. setForwardOnly(true) means that only one row is used/re-used. The value cache wasn't being cleared out when moving to a new row, so the above assumption was invalid. Task-number: QTBUG-6421 Reviewed-by: Justin McPherson
* | | | | Optimize QOrderedMutexLockerOlivier Goffart2009-12-081-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | try first to lock without releasing the second mutex. If it succees at first (likely), we should not have deadlock, and we do not need to unlock and relock the first mutex Should help in ~QObject Reviewed-by: brad
* | | | | Small optimisations in ~QObjectOlivier Goffart2009-12-081-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid calling signalSlotMutex while there is a very small probability that the node will be different or that the mutex are the same for two different object. Reviewed-by: brad
* | | | | Disable some code in normal build.Olivier Goffart2009-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Q_AUTOTEST_EXPORT is always defined. (it is defined empty if not internal build) Reviewed-by: Brad
* | | | | Assistant: Don't re-load saved pages that don't exist anymore.ck2009-12-081-11/+13
| | | | | | | | | | | | | | | | | | | | Reviewed-by: kh1
* | | | | Added QToolBar::visibilityChanged(bool) signal.J-P Nurmi2009-12-083-0/+41
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Thierry
* | | | | Assistant: Add "shared" directory to dependency list.ck2009-12-071-0/+1
| | | | |
* | | | | Fix memory leakDavid Faure2009-12-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 391 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* | | | | Assistant: Use tracing macro in all functions.ck2009-12-0718-0/+472
| | | | | | | | | | | | | | | | | | | | Reviewed-by: kh1
* | | | | Assistant: Logical re-structuring of start-up code.ck2009-12-076-148/+172
| | | | | | | | | | | | | | | | | | | | Reviewed-by: kh1
* | | | | Fix performance issue with live resizeRichard Moe Gustavsen2009-12-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling [NSView addTrackingArea] is slow. So doing this for views that are not even visible on screen is unnecesary. This patch will greatly improve the speed for some (perhaps extreme) cases. Task-number: QT-1610 Reviewed-by: MortenS
* | | | | Cleanup, no functional change.kh12009-12-071-23/+30
| | | | |
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-12-0537-92/+544
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge commit '33441e2a611f07207b0b942368aab9010cdf8ab1' of ↵Simon Hausmann2009-12-0540-370/+702
| |\ \ \ \ | | | | | | | | | | | | | | | | | | oslo-staging-1/4.6 into 4.6
| | * \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2009-12-04100-800/+1642
| | |\ \ \ \
| | | * | | | Fix compilation with Sun CC 5.9: it was crashing with this code.Thiago Macieira2009-12-041-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Definitely a compiler bug. Reviewed-by: Kent Hansen
| | | * | | | Apparently fixes some build issues on some old unixes...Pierre Rossi2009-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Marius Storm-Olsen
| | * | | | | doc: Example page now lists images used by the exampleMartin Smith2009-12-0410-26/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It just links to an empty page at the moment, i.e., it doesn't load the images. But I will add that. Task-number: QTBUG-4484
| * | | | | | Merge commit 'c0b81480b2909b18ac15bdd124a562ae005c2f41' into origin-4.6Olivier Goffart2009-12-0423-30/+302
| |\ \ \ \ \ \
| | * | | | | | Rebind window surface fbo after native GL renderingRhys Weatherley2009-12-044-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the user called QGLFramebufferObject::bind()/release() during a beginNativePainting() callout, the release() would reset the context's fbo to zero, not the actual window surface fbo. Task-number: QTBUG-6204 Reviewed-by: Tom
| | * | | | | | Better check for EGL extension stringsRhys Weatherley2009-12-041-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous code might have failed if the desired extension name was a prefix of another name: "EGL_foo" member of "EGL_foo_bar". This change introduces a more precise check. Task-number: QTBUG-6454 Reviewed-by: Sarah Smith
| | * | | | | | Some doc fixesJan-Arve Sæther2009-12-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove a lie. - When referring to the size of an anchor, refer to it consistently as 'spacing' instead of magnitude.
| | * | | | | | Fixes broken selection with Shift and extended selectionOlivier Goffart2009-12-032-2/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ItemAt() is in viewport coordinate. Pressed index is in coordinate relative to the whole view (regression since Qt 4.5) Reviewed-by: thierry Task-number: QTBUG-6407
| | * | | | | | Add extra auto-test for topLevel list corruption.Alexis Menard2009-12-031-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding auto-tests make QA people happy. Reviewed-by:TrustMe
| | * | | | | | QCompleter wouldn't emit highlighted() and activated() signalsGabriel de Dietrich2009-12-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Completion was checked before sending the textEdited() signal from QLineEdit. The behaviour has been reverted as in 4.5. Reviewed-by: aalpert Task-number: QTBUG-6386
| | * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-12-035-7/+122
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-staging2
| | | * | | | | | qreal-izationAleksandar Sasha Babic2009-12-021-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding more wrapper math related functions. This should enable us to have more control over which calls are actually made. Don't worry too much for some "if" statements, the compiler is smart enough to make direct calls to specific math functions. Task-number: QTBUG-4894 Reviewed-by: axis
| | | * | | | | | Fixed softkey merging/traversing over window boundaries.Janne Anttila2009-12-022-1/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If current dialog implementation had parent and no softkeys set, the dialog got softkeys from parent. This commit changes the behaviour so that softkeys are not traversed over window boundaries. Also added autotest for the bug report. Task-number: QTBUG-6163 Reviewed-by: Jason Barron
| | | * | | | | | Fixed crash on Symbian when using QProgressDialog::setCancelButton(0).Janne Anttila2009-12-021-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash occured since d->cancelAction is child of d->cancelButton, which is essentially same as d->cancel pointer. Due to parent/child relationship, deleting d->cancel deleted also chilren including cancelAction. Then explicitly deleting already deleted d->cancelAction (dangling pointer) caused KERN-EXEC 3 crash. There is no need to delete d->cancelAction since it is deleted via parent/child relationship. Task-number: QTBUG-6109 Reviewed-by: Miikka Heikkinen
| | | * | | | | | Fixed "illegal empty declaration" warning from \tools\xmlpatternsJanne Anttila2009-12-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following warning was reported by Symbian compilers: tools\xmlpatterns\main.cpp:83: warning: illegal empty declaration Reviewed-by: TrustMe
| | * | | | | | | Stabilize tests on X11Olivier Goffart2009-12-024-5/+14
| | | | | | | | |
| | * | | | | | | Fix tst_QSystemLock::processesOlivier Goffart2009-12-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Paths were not correct
| | * | | | | | | Fixes transformation problems with QGraphicsProxyWidget.Yoann Lopes2009-12-023-4/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the paintEvent of the widget used in a QGraphicsProxyWidget, the worldMatrix was wrongly used by the painter instead of the deviceMatrix. Similar problem in the WindowsXP Style, the worldMatrix was used instead of the deviceMatrix for determining if the widget is transformed (reviewed by eblomfel). Task-number: QTBUG-5939 Reviewed-by: bnilsen Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| * | | | | | | | Fixed compile for S60.Rohan McGovern2009-12-041-1/+1
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | QObjectPrivate::isSignalConnected was inlined, update QtCoreu.def
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Bill King2009-12-0314-54/+106
| |\ \ \ \ \ \ \
| * | | | | | | | Fixes: OCI QSqlDatabase.tables() does not work with system tables.Bill King2009-12-022-31/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5298 Reviewed-by: Justin McPherson
* | | | | | | | | Fix compilation of the QObject testOlivier Goffart2009-12-041-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hardcoded generated include patch was wrong. Also don't error if the MOC_OUTPUT_REVISION change. The file will be updated if needed if ever the test start failing.
generated by cgit v0.12 at 2025-08-26 01:33:21 (GMT)