summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixes wrong composition mode for cached backgrounds in Graphics View.Bjørn Erik Nilsen2010-03-032-6/+34
| | | | | | | | | | | This change partially reverts commit a589005f and therefore fully reverts 68be6457. We cannot assume that only opaque pixels are painted in drawBackground(). Regression against 4.5. Auto-test included. Task-number: QTBUG-8168 Reviewed-by: trond
* Support keypad input with vnc driverPaul Olav Tvete2010-03-031-0/+34
| | | | | Task-number: QT-1849 Reviewed-by: Jeremy
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-035-38/+154
|\ | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Properly fixes crash when destroying a QGraphicsItem. Updating SQL binding docs to reflect reality.
| * Properly fixes crash when destroying a QGraphicsItem.Yoann Lopes2010-03-033-37/+137
| | | | | | | | | | | | | | | | | | | | | | The focus is now properly cleared when hiding or showing focus scopes or when a child of a focus scope is destroyed. No change of behavior in how focus scope works for QML. Autotest included. Task-number: QT-2649 Reviewed-by: Andreas Aardal Hanssen
| * Updating SQL binding docs to reflect reality.Bill King2010-03-032-1/+17
| | | | | | | | | | Task-number: QTBUG-7218 Reviewed-by: Justin McPherson
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-032-3/+12
|\ \ | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Reduced S60 softkey flickering caused by softkey image support.
| * | Reduced S60 softkey flickering caused by softkey image support.Janne Anttila2010-03-032-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | EikSoftkeyImage::SetLabel call seems to clear and redraw the softkeys every time when called. This commit removes the unnecessary calls to the method if given CBA is already in text mode. Reviewed-By: Sami Merila
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0324-1395/+2547
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix build break in qapplication_x11.cpp. update russian translations and phrasebook Allow platform specific values for the double click radius. Fix strict-aliasing breakage with SunCC: the union trick is a GCC extension. QNAM HTTP: Fix invoking a method when being destructed right now QAbstractSocket: Use new faster DNS function Add DNS caching to QHostInfo Make the icon visible when set on an action in a QSystemTrayIcon on Mac Carbon : Setting palette brush to a pixmap does not work.
| * | | Fix build break in qapplication_x11.cpp.Adrian Constantin2010-03-031-0/+5
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0324-1395/+2542
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: update russian translations and phrasebook Allow platform specific values for the double click radius. Fix strict-aliasing breakage with SunCC: the union trick is a GCC extension. QNAM HTTP: Fix invoking a method when being destructed right now QAbstractSocket: Use new faster DNS function Add DNS caching to QHostInfo Make the icon visible when set on an action in a QSystemTrayIcon on Mac Carbon : Setting palette brush to a pixmap does not work.
| | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0224-1395/+2542
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: update russian translations and phrasebook Allow platform specific values for the double click radius. Fix strict-aliasing breakage with SunCC: the union trick is a GCC extension. QNAM HTTP: Fix invoking a method when being destructed right now QAbstractSocket: Use new faster DNS function Add DNS caching to QHostInfo Make the icon visible when set on an action in a QSystemTrayIcon on Mac Carbon : Setting palette brush to a pixmap does not work.
| | | * | update russian translations and phrasebookRitt Konstantin2010-03-029-1363/+2269
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 485 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | * | Allow platform specific values for the double click radius.Raino Priha2010-03-023-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2883 Reviewed-by: Volker Hilsheimer
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0212-30/+265
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix strict-aliasing breakage with SunCC: the union trick is a GCC extension. QNAM HTTP: Fix invoking a method when being destructed right now QAbstractSocket: Use new faster DNS function Add DNS caching to QHostInfo Make the icon visible when set on an action in a QSystemTrayIcon on Mac Carbon : Setting palette brush to a pixmap does not work.
| | | | * | Fix strict-aliasing breakage with SunCC: the union trick is a GCC extension.Thiago Macieira2010-03-021-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's probably also an MSVC extension, because the MSVC compiler has never complained about this fact, nor generated unintended code. Anyway, the only way is to reinterpret_cast the quintptr. It's not an aliasing violation to do it because we never access the integer as anything other than quintptr. Reviewed-By: Bradley T. Hughes
| | | | * | QNAM HTTP: Fix invoking a method when being destructed right nowMarkus Goetz2010-03-021-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart
| | | | * | QAbstractSocket: Use new faster DNS functionMarkus Goetz2010-03-025-5/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use qt_qhostinfo_lookup which avoids the event loop when the DNS result is already cached. Reviewed-by: Thiago
| | | | * | Add DNS caching to QHostInfoMarkus Goetz2010-03-023-8/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default enabled, but it can be disabled via a compile flag. Reviewed-by: Thiago
| | | | * | Make the icon visible when set on an action in a QSystemTrayIcon on MacAndy Shaw2010-03-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a Carbon specific problem, it was already working fine in Cocoa Task-number: QTBUG-8521 Reviewed-by: richard
| | | | * | Carbon : Setting palette brush to a pixmap does not work.Carlos Manuel Duclos Vergara2010-03-021-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem occurs because we were drawing the pixmap and then clearing the buffer. This patch basically moves the clearing of the buffer to the start of the process instead of having it in the middle. Task-number: QTBUG-7800 Reviewed-by: Morten Sorvig
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-031-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: QSound OSX; Fix memory leak.
| * | | | | QSound OSX; Fix memory leak.Justin McPherson2010-03-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by:Dmytro Poplavskiy
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-0219-254/+372
|\ \ \ \ \ \ | |_|/ / / / |/| | | | / | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix compile. Simplify DirectFB performance debugging QString::section: Fix crash with SectionIncludeLeadingSep flag Expand indicator would not be displayed after removal of a collapsed item's child Compile with GCC 3.3 Fixed rendering bugs when scrolling graphics items with drop shadows. 2nd part of revert of commit 435bbd4be73768f617e4a Revert "ItemViews: make it possible for chekcable items to get partiallyChecked" Prevented assert on 1 pixel wide / high images in qt_blurImage. skip tst_QDialog::throwInExec on WinCE, ARM platform Fix licenseCheck autotest Fixes: ODBC Driver expects 16bit when system is 32bit Make composition modes work better for DirectFB Don't disable alpha when filling with opaque color Add support for composition mode DSPD_DST in DFB Uncomment #DIRECTFB_DRAWINGOPERATIONS in pri-file Fix build breakage in windowflags example
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Bill King2010-03-021-16/+87
| |\ \ \ \
| | * | | | Simplify DirectFB performance debuggingAnders Bakken2010-03-021-16/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow people to control whether or not to warn on/disable raster fallbacks using the following mechanism: export QT_DIRECTFB_DISABLE_RASTERFALLBACKS="draw_pixmap|draw_text" export QT_DIRECTFB_WARN_ON_RASTERFALLBACKS="draw_lines" It's still possible to define QT_DIRECTFB_WARN_ON_RASTERFALLBACKS to something for legacy reasons. The environment variable check is only available in debug mode.
| * | | | | Fix compile.Bill King2010-03-021-30/+30
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Stupid inconsistent constness/overall api Task-number: QTBUG-6928
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-0219-236/+283
| |\ \ \ \ |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QString::section: Fix crash with SectionIncludeLeadingSep flag Expand indicator would not be displayed after removal of a collapsed item's child Compile with GCC 3.3 Fixed rendering bugs when scrolling graphics items with drop shadows. 2nd part of revert of commit 435bbd4be73768f617e4a Revert "ItemViews: make it possible for chekcable items to get partiallyChecked" Prevented assert on 1 pixel wide / high images in qt_blurImage. skip tst_QDialog::throwInExec on WinCE, ARM platform Fix licenseCheck autotest Fixes: ODBC Driver expects 16bit when system is 32bit Make composition modes work better for DirectFB Don't disable alpha when filling with opaque color Add support for composition mode DSPD_DST in DFB Uncomment #DIRECTFB_DRAWINGOPERATIONS in pri-file Fix build breakage in windowflags example
| * | | | QString::section: Fix crash with SectionIncludeLeadingSep flagOlivier Goffart2010-03-022-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And start is out of bounds. Reviewed-by: Thiago Reviewed-by: Joao Task-number: QTBUG-4306
| * | | | Expand indicator would not be displayed after removal of a collapsed item's ↵Gabriel de Dietrich2010-03-022-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | child While setting the hasChildren property of QTreeViewItem, "collapsed" and "not visible" were being mistaken. Auto-test included. Reviewed-by: Olivier Task-number: QTBUG-7443 (cherry picked from commit 77670c3c0fdc3021356e212e94042a0b5a4f4f8c)
| * | | | Compile with GCC 3.3Olivier Goffart2010-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8554 Reviewed-by: Gabriel
| * | | | Fixed rendering bugs when scrolling graphics items with drop shadows.Samuel Rødal2010-03-023-43/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't clip source pixmaps to the device rect, as there's no way of knowing which parts of the source pixmap are needed for the part of the graphics effect that's unclipped. Reviewed-by: Bjørn Erik Nilsen
| * | | | 2nd part of revert of commit 435bbd4be73768f617e4aThierry Bastian2010-03-021-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After a mess-up by git rebase... Reviewed-by: ogoffart
| * | | | Revert "ItemViews: make it possible for chekcable items to get partiallyChecked"Thierry Bastian2010-03-021-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 435bbd4be73768f617e4a4083a345d1d8d62daa3. Reviewed-By: ogoffart
| * | | | Prevented assert on 1 pixel wide / high images in qt_blurImage.Samuel Rødal2010-03-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't attempt to run qt_halfScaled on images less than 2px in either dimension. Particularly, avoid doing this from qt_blurImage, where that situation can happen as a result of a clipped QGraphicsEffect. Reviewed-by: Bjørn Erik Nilsen
| * | | | skip tst_QDialog::throwInExec on WinCE, ARM platformJoerg Bornemann2010-03-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rethrowing exceptions across DLL boundaries crashes on Windows CE ARM devices. This is a restriction of the Microsoft tools. See thread "(Re)throwing from a catch block across dll boundaries" in microsoft.public.windowsce.embedded.vc Reviewed-by: ninerider
| * | | | Fix licenseCheck autotestOlivier Goffart2010-03-021-1/+1
| | | | |
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Bill King2010-03-024-2/+11
| |\ \ \ \
| | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-024-63/+47
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Make composition modes work better for DirectFB Don't disable alpha when filling with opaque color Add support for composition mode DSPD_DST in DFB Uncomment #DIRECTFB_DRAWINGOPERATIONS in pri-file Fix build breakage in windowflags example
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-sql-team into 4.6Bill King2010-03-0267-438/+13057
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Make composition modes work better for DirectFBAnders Bakken2010-03-011-60/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that I have to premultiply the colors I pass to IDirectFBSurface->SetColor when composition mode != Source|SourceIn. It now seems to behave the same way as the raster engine which I guess should be considered the authority on this matter. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| | * | | | Don't disable alpha when filling with opaque colorAnders Bakken2010-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt heuristics say that a QPixmap becomes an alpha pixmap when filled with a color with alpha != 255 but not that it returns to being opaque when filled with a color with alpha == 255 Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| | * | | | Add support for composition mode DSPD_DST in DFBAnders Bakken2010-03-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This porter duff rule was added in DirectFB 1.2 Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| | * | | | Uncomment #DIRECTFB_DRAWINGOPERATIONS in pri-fileAnders Bakken2010-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has no effect unless QT_DIRECTFB_WARN_ON_RASTERFALLBACKS or QT_DIRECTFB_DISABLE_RASTERFALLBACKS is defined but will decrease likelyhood of customers encountering strange compile errors if they don't uncomment it when using these defines. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| | * | | | Fix build breakage in windowflags exampleRhys Weatherley2010-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith
| * | | | | Fixes: ODBC Driver expects 16bit when system is 32bitBill King2010-03-024-109/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed ODBC to use SQLTCHAR type and not assume that wchar's are 2 bytes wide. Task-number: QTBUG-6928 Reviewed-by: Justin McPherson
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-025-3/+24
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Symbian event dispatcher needs to run all active objects. Re-applied a fix which get lost during softkey refactoring. Fixed FEP crash when selected text was replaced with a a new T9 text. Fix windowflags example
| * | | | | Symbian event dispatcher needs to run all active objects.Jani Hautakangas2010-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian event dispatcher runs only active objects that have priority CActive::EPriorityIdle or above. CActive defines standard priorities but priority can be anything from KMinTInt to KMaxTInt Task-number: QTBUG-8654 Reviewed-by: axis
| * | | | | Re-applied a fix which get lost during softkey refactoring.Janne Anttila2010-03-022-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See original commit (b461da1040c32d6690870290d6716a3b5cb7e9e9) for more information. Task-number: QTBUG-6220 Reviewed-By: TrustMe
| * | | | | Fixed FEP crash when selected text was replaced with a a new T9 text.Janne Anttila2010-03-021-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In T9 input mode StartFepInlineEditL gets called with empty initial text. In case there was text selected in editor when editing started, the selected text did not get removed since the logic in editors to detect input is as follows: bool isGettingInput = !event->commitString().isEmpty() || event->preeditString() != preeditAreaText() || event->replacementLength() > 0; This means that empty preeditString did not trigger selection removal, but the selected text was removed when non-empty inline text was provided by UpdateFepInlineTextL. However, the S60 FEP assumes that StartFepInlineEditL removes the selected text, i.e GetCursorSelectionForFep after StartFepInlineEditL must return empty selection. The above issue was fixed by removing the selected text explicitly in StartFepInlineEditL if aInitialInlineText is empty. Task-number: QTBUG-6363 Reviewed-by: Axis
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-011-1/+1
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix windowflags example