summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2009-12-0852-192/+725
|\
| * Compile with -no-exceptions on Mac.Morten Johan Sørvig2009-12-082-3/+17
| | | | | | | | | | | | | | | | | | | | | | qfontdialog_mac.mm needs to handle exceptions thrown by Cocoa, even if Qt is configured with if -no-exceptions. This ads a bit of qmake logic for the benefit of a single file, but I would like to keep -no-exceptions working. The savings are significant (around 10-15%). Revby: Richard Moe Gustavsen
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Morten Johan Sørvig2009-12-08149-1015/+2515
| |\
| | * Autotest: ensure that QSharedPointer does proper autocasting throughThiago Macieira2009-12-081-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | function calls. Seen on qt-interest. Reviewed-by: Trust Me
| | * Compile on Windows CE.Bradley T. Hughes2009-12-081-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | Windows CE does not support Windows hook at all, so we need to call our hook function "manually" from process events. Task-number: QTBUG-6083 Reviewed-by: joerg
| | * Add copyright header so the autotest will pass.Paul Olav Tvete2009-12-071-0/+41
| | |
| | * Add support for the Selected QIcon::Mode when rendering the systray icon (Mac)Jono Cole2009-12-071-0/+28
| | | | | | | | | | | | | | | Merge-request: 1599 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| | * Added a manual test for testing a z-order of overlapping widgets.Denis Dzyubenko2009-12-072-0/+83
| | | | | | | | | | | | | | | | | | The test uses QWidget::raise, lower and stackUnder functions. Reviewed-by: trustme
| | * Fixed calculating CRC32 on 64bit platformsDenis Dzyubenko2009-12-071-2/+2
| | | | | | | | | | | | | | | | | | | | | When compiling on a 64bit machine we should make sure that we won't overflow the 32bit CRC value because of casting signed int to unsigned long. Reviewed-by: Thiago
| | * Cannot drag scrollbars in a QPlainTextEdit on Cocoa.Prasanth Ullattil2009-12-071-66/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QPlainTextEdit can change the scroll ranges while dragging the scrollbar. This will eventualy call QWidget::raise(), on Cocoa it was done by removing the NSView and adding it back. This causes problems like resetting internal state while a mouseDragged was active on the view. The fix we will now sort the views based on their Qt-z-order. lower() & stackUnder() also fixed like this. Reviewed-by: Denis
| | * Merge commit '33441e2a611f07207b0b942368aab9010cdf8ab1' of ↵Simon Hausmann2009-12-0540-370/+702
| | |\ | | | | | | | | | | | | oslo-staging-1/4.6 into 4.6
| | * \ 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
| | |\ \ \ \
| | | * | | | Fix for virtual keyboard poping up when it should not.Robert Griebl2009-12-034-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pressing and releasing the finger/stylus on an editable text widget should only trigger the input method if the release position is still within the widget's boundaries. Reviewed-by: axis
| | | * | | | Added a placeholderText(*) property to QLineEdit.Robert Griebl2009-12-033-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Please note: Qt for Maemo5 will already use it in 4.6, while the other platforms will be enabled in 4.7 (otherwise be would break BIC there) This commit adds a so-called placeholder text for line edits. If the widget doesn't have focus and the text() is empty, this placeholder will be shown. (*) also known as hint, click-message or descriptive text Reviewed-by: jasplin
| | | * | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-12-03126-602/+1680
| | | |\ \ \ \
| | | * | | | | really fix mingw+msysOswald Buddenhagen2009-12-022-27/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i missed the fact that lib2/ was duplicating the magic (totally pointlessly). so now all the magic moved to lib2/, as lib/ is not used on symbian anyway.
| | | * | | | | less bizarre code; fix minor mistakesOswald Buddenhagen2009-12-021-25/+25
| | | | | | | |
| | | * | | | | compile fix for Qt in namespacehjk2009-12-011-0/+4
| | | | | | | |
| | | * | | | | Assistant: Fix race condition in CLucene indexer.ck2009-12-012-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to make sure the running thread can respond to the cancel request before overwriting it. Reviewed-by: kh1
| | | * | | | | fix for mingw+msysOswald Buddenhagen2009-11-301-5/+9
| | | | | | | |
| | | * | | | | Fix a documentation typo.Christian Kamm2009-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Samuel Rødal
| | | * | | | | QVector: fix const_iterator-=(int)hjk2009-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Harald Fernengel
| | * | | | | | Fixes: OCI QSqlDatabase.tables() does not work with system tables.Bill King2009-12-022-31/+68
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5298 Reviewed-by: Justin McPherson
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Bill King2009-12-02105-573/+1492
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Bill King2009-12-0118-23/+182
| | |\ \ \ \ \ \
| | * | | | | | | remove unused line of codeDerick Hawcroft2009-12-011-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6387
| | * | | | | | | Fixed QSqlRelationalTableModel doesn't correctly work with relation in other ↵Bill King2009-11-302-5/+6
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | database schema PSQL doesn't like having schema scoping in "AS" aliasing of fields, so use everything after the last "." separator for generating the alias. Task-number: QTBUG-5373 Reviewed-by: Justin McPherson
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Morten Johan Sørvig2009-12-024-14/+10
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Morten Johan Sørvig2009-12-01300-1632/+5266
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Doc: Document QSystemTrayIcon::showMessage() Mac behavior.Morten Johan Sørvig2009-11-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document that that QSystemTrayIcon::showMessage requires Growl.
* | | | | | | | | | Doc: Fixed references to "old" 2.x and "new" 3.x font name conventions.David Boddie2009-12-071-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me As-reported-by: Eskil
* | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2009-12-04239-1809/+3904
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | 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
generated by cgit v0.12 at 2025-09-06 06:55:12 (GMT)