summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-19254-2206/+9154
|\
| * Merge branch '4.6' of oslo-staging-1 into 4.6Simon Hausmann2009-11-1944-321/+486
| |\
| * | Fix QCombobox painting regression on WindowsOlivier Goffart2009-11-191-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Some style relies on this broken behaviour that was fixed in commit e1a81c96790bee72ee4fbd2b0c4a7b48078c4ec1 The text on the combobox uses the wrong palette role. Reviewed-by: jbache
| * | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-19237-2013/+1773
| |\ \
| | * | Remove examples/effects/customshader which uses private APITom Cooksey2009-11-1919-572/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 3f109fd85cbdc49dc3ef1c14066073079f4e34bf made QGraphicsShaderEffect private API, however the example showing how to use it was kept. This patch just removes that example. Reviewed-by: Samuel
| | * | Ran the script utils/normalizeOlivier Goffart2009-11-18186-1243/+1243
| | | | | | | | | | | | | | | | Over src/ tools/ examples/ and demos/
| | * | Fixed tst_QTableView::changeHeaderData auto-test on MacGabriel de Dietrich2009-11-181-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Olivier
| | * | Fixed tst_QTableView::mouseWheel auto-test on MacGabriel de Dietrich2009-11-181-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | The fix reverts some changes from 1f4e378ca0f9c63bb99a92f3e98b104a0baa408a. Reviewed-by: Olivier
| | * | MAke a readonly QLineEdit not show "write" actions in its context menuThierry Bastian2009-11-181-18/+28
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-2494 Reviewed-by: Gabriel
| | * | Make the layout not grow in filndfiles example whne one clicks findThierry Bastian2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5528 Reviewed-by: Gabriel
| | * | QListView: fixes skipping one item in pageDown(Up)Leonardo Sobral Cunha2009-11-182-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous implementation was scrolling down (number of visible items in viewport) + 1 and this was leading to one item being skipped while doing page down (the same also happened for page up). Now we are scrolling (number of visible items in viewport) - 1 for each page down(up) (the '-1' is for keeping the context, so the last item will turn into the first in case of a page down, for example). Task-number: QTBUG-5877 Reviewed-by: thierry
| | * | QListView: cleaning up whitespacesLeonardo Sobral Cunha2009-11-182-17/+7
| | | |
| | * | Fix html output of docsThomas Zander2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The sub-title was too big which was caused by an unclosed anchor tag. Reviewed-by: David Boddie
| | * | QMenu: make the menu follow its parent/caused layout directionThierry Bastian2009-11-184-1/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The autotest are included Task-number: QTBUG-5884 Reviewed-by: ogoffart
| | * | Crash when rendering a scene using DeviceCoordinateCacheGabriel de Dietrich2009-11-182-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The execution flow would allow the widget the scene would be rendered on to be null. However this very widget was being used when using DeviceCoordinateCache to get the desktop size. We now skip this optimisation when no widget is given. Auto-test included. Reviewed-by: bnilsen Task-number: QTBUG-5904
| | * | Fix tst_QAlgorithms::test_qBinaryFind on solarisOlivier Goffart2009-11-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Comparison between const and non-const iterator is not safe Reviewed-by: Joao
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Eskil Abrahamsen Blomfeldt2009-11-188-112/+155
| | |\ \
| | | * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-188-112/+155
| | | |\ \ | | | | | | | | | | | | | | | | | | 4.6-staging2
| | | | * | Removed Browser demo from Symbian buildsMiikka Heikkinen2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Browser demo isn't currently compiling for Symbian GCCE builds because ARMV5 built static uitools.lib apparently isn't compatible with linking into GCCE application. Removed the browser from Symbian builds as a hotfix for 4.6.0. Task-number: QTBUG-5692 Reviewed-by: Janne Anttila
| | | | * | Put the dialog buttons into a scrollarea.Alessandro Portale2009-11-171-64/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now, they fit into a smallscreen. Reviewed-By: TrustMe
| | | | * | Build without QT_KEYPAD_NAVIGATIONAlessandro Portale2009-11-172-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is actually not much of a point to run a keypadnavigation test without QT_KEYPAD_NAVIGATION being enabled. But let's at least build the app. Reviewed-By: TrustMe
| | | | * | Fix DrillDown for moblie devices.Alessandro Portale2009-11-171-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Use QFormLayout instead of QGridLayout 2) Remove Symbian specific size hack 3) Give button box a parent, so that it's buttons get properly added as the dialog's softkeys. 4) Add submitButton with a positive button role Task-number: QTBUG-5685 Reviewed-by: Jason Barron
| | | | * | showMaximized() lets us see SoftKeysAlessandro Portale2009-11-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation would not show Softkeys as long as we show a widget via showFullScreen. Therefore, on Symbian we will for now use showMaximized Reviewed-By: Jason Barron
| | | | * | QS60Style returns hint QFormLayout::WrapLongRowsAlessandro Portale2009-11-172-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To get a mobile friendly 1-column layout, we can set QFormLayout's rowWrapPolicy. S60Style should return QFormLayout::WrapLongRows as the SH_FormLayoutWrapPolicy styleHint. Reviewed-by: Jason Barron
| | | | * | Incorporate feedback by Espen.Frans Englich2009-11-171-24/+33
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Espen Riskedal
| | * | | | Export QStateMachine::WrappedEvent and QStateMachine::SignalEventEskil Abrahamsen Blomfeldt2009-11-182-2/+10
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These two classes were missing exports. Since the accessors are inline, the bug would only be visible when someone tried to call the constructors of the classes. Reviewed-by: Kent Hansen
| | * | | Merge upstream/4.6 into oslo-staging-2Olivier Goffart2009-11-17198-3369/+5926
| | |\ \ \
| | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Yoann Lopes2009-11-1719-62/+273
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Marius Bugge Monsen2009-11-1768-686/+932
| | | |\ \ \ \
| | | | * | | | Warning FixesOlivier Goffart2009-11-171-4/+0
| | | | | | | |
| | | | * | | | Mouse wheel wouldn't scroll the itemview when over header viewsGabriel de Dietrich2009-11-172-1/+23
| | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mouse wheel event was not being relayed to the parent (supposedly QAbstractScrollArea) widget. Auto-test included. Reviewed-by: Olivier Task-number: QTBUG-5237
| | | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-178-30/+172
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-staging2
| | | | | * | | Removed drilldown from fluidlauncher demo.axis2009-11-173-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has too many problems at the moment, like taking up too much space and not being able to close the popup window. RevBy: Alessandro Portale
| | | | | * | | Fix typo.Frans Englich2009-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | | | * | | Document the state of support in Symbian.Frans Englich2009-11-172-1/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The content was compiled primarily by asking the members of the S60 team. Reviewed-by: David Boddie
| | | | | * | | LineEdit graphics are sometimes missing from webpages with s60styleSami Merilä2009-11-172-25/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the webpage does define BODY colors for background, it is possible that lineEdits are not drawn at all. Actually, they are drawn but with transparent background, which makes them near-invisible. This is due to that QS60Style tries to check if the themePalette has been changed and if it has forwards the drawing of that particular widget to common style. Common style unfortunately uses active style's palette to draw the widget. S60Style defines Base to be transparent (to get the theme background shine through) and common style tries to use Base to draw lineEdit. End result is transparent lineEdit on webpage. This fix makes more educated deduction when it tries to see if style has been changed. This is related to QTBUG-4885. Task-number: QTBUG-4885 Reviewed-by: Janne Koskinen
| | | | | * | | e32def.h include removes TRUE/FALSE redifine warnings on Symbian with gcce ↵tomyri2009-11-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compiler Signed-off-by: axis <qt-info@nokia.com> axis: While the fix seems to break our policy of having no system headers included from qglobal.h, it should be harmless since e32def.h is to Symbian what stddef.h is to POSIX.
| | | | * | | | Fixed a crash on Mac in QPixmap when loading pixmaps of different sizes.Trond Kjernåsen2009-11-172-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The size of the original pixmap data block wasn't retained, which would result in out-of-bound reads in the memcpy() call. Task-number: QTBUG-5070 Reviewed-by: Kim
| | | | * | | | Fix pixel alignment of glyphs when using raster engine on Mac CocoaEskil Abrahamsen Blomfeldt2009-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The left bearing of the glyph has to be rounded before truncated, otherwise the subpixel positioning of the glyph will be lost. The visible consequence of this was on Mac Cocoa where certain pairs of glyphs would get an extra pixel of space between them when running with graphics system raster. With small fonts it would look pretty bad. Task-number: QTBUG-5430 Reviewed-by: Trond
| | | * | | | | Fix compile issues on AIX with the XLC compiler.Marius Bugge Monsen2009-11-171-12/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compiler is not smart enough to figure out the type of arguments in QCOMPARE, so we have to explicitly cast. This is also a problem with the Metrowerks compiler, and the cast is safe, so remove the #ifdef and always cast. Reviewer-by: Olivier Goffart
| | * | | | | | Fixes polish events for explicitly hidden GraphicsWidgetItems.Yoann Lopes2009-11-172-5/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that hidden items never get added to "unpolishedItems" list and thus never get the polish event. Autotest included. Task-number: QTBUG-3939 Reviewed-by: bnilsen
| * | | | | | | Fixed Multi-length strings not implemented for float functionsOlivier Goffart2009-11-192-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5963 Reviewed-by: Oswald Buddenhagen Reviewed-by: Eskil
| * | | | | | | Revert "Fix detection of linux-g++"Paul Olav Tvete2009-11-194-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 333bd2e761af8aaf6efd3d66eb028af046c4dfc2. The change broke compilation of QWS, since QtGui depends on glib, but doesn't link with it directly. This needs to be fixed properly, but not just before the release. Reviewed-by: Harald Fernengel
| * | | | | | | doc: Removed google search engine.Martin Smith2009-11-191-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The google search engine for the doc tree must be generated after the doc tree has been built. The google search engine for the doc tree should only appear in the online docs.
| * | | | | | | French translation of designerBenjamin Poulain2009-11-182-0/+7047
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Pierre Rossi
| * | | | | | | Updates the french translation of qt strings in qt_fr.tsPierre Rossi2009-11-182-116/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also took care of placing non breakable spaces before double punctuation characters. Reviewed-by: Benjamin Poulain
| * | | | | | | Fixes duplicate accelerators in french translation of assistantYoann Lopes2009-11-181-42/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also put non breakable spaces in front of characters such as ':', '!' and '?' Reviewed-by: Pierre Rossi
| * | | | | | | Softkeymanager to not update sofkeys when native s60 dialog is shownJason Barron2009-11-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Qt Bug: QTBUG-5788 Softkeys do not change to dialog specific ones when native S60 dialog is being opened on top of Qt application Initial-patch-by: Markus Nolvi Reviewed-by: axis
| * | | | | | | Removed Browser demo from Symbian buildsMiikka Heikkinen2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Browser demo isn't currently compiling for Symbian GCCE builds because ARMV5 built static uitools.lib apparently isn't compatible with linking into GCCE application. Removed the browser from Symbian builds as a hotfix for 4.6.0. Task-number: QTBUG-5692 Reviewed-by: Janne Anttila (cherry picked from commit 31d29b227a7609ab0dadca4244cafec919264ba8)
| * | | | | | | Symbian docs: Repair some documentation damage, remove obsolete file.Frans Englich2009-11-183-47/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe