summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-12-02124-338/+414
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Fix indentingAaron Kennedy2009-12-021-6/+6
| |
| * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2009-12-02124-333/+379
| |\ | | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: src/declarative/qml/qmlvme.cpp
| | * Fix initial scaling. QWebPage::setPreferredSize doesn't really work.Warwick Allison2009-12-021-6/+0
| | |
| | * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-12-0225-196/+465
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmlmetatype.cpp
| | * | Change from scaling/zooming by zoomFactor to instead use painter scaling.Warwick Allison2009-12-025-32/+85
| | | | | | | | | | | | | | | | Uses a fixed zoomFactor of 4 to allow sufficient sub-"pixel" precision.
| | * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-12-013-6/+138
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-12-012-2/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | Remove include styles that rely on configure.Warwick Allison2009-12-01122-298/+297
| | | | | | | | | | | | | | | | | | | | | | | | May help modularization (syncqt and configure are Qt-specific).
| * | | | | Minor performance tweaksAaron Kennedy2009-12-022-6/+36
| | |_|_|/ | |/| | |
* | | | | Update header & footer pos when items inserted.Martin Jones2009-12-021-0/+2
|/ / / /
* | | | Delay the creation of the signal parameter object until neededAaron Kennedy2009-12-022-12/+14
| | | |
* | | | Run QmlParserStatus::componentComplete() in opposite orderAaron Kennedy2009-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | This improves perf when a parent depends on its childrens' size.
* | | | Cleanup cached binding closuresAaron Kennedy2009-12-024-14/+19
| | | |
* | | | Cache binding closuresAaron Kennedy2009-12-0211-16/+118
| | | |
* | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2009-12-028-13/+204
|\ \ \ \ | | | | | | | | | | | | | | | into kinetic-declarativeui
| * \ \ \ Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-12-021-1/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | Get qsTr and friends working again.Michael Brasser2009-12-011-1/+4
| | | |_|/ | | |/| |
| * | | | Allow Flickable direction to be set explicitly.Martin Jones2009-12-025-6/+62
| |/ / /
| * | | Fix jumpy EaseFollow animationsMartin Jones2009-12-011-1/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-5766
| * | | Add header and footer to ListView.Martin Jones2009-12-012-5/+137
| | |/ | |/|
* | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2009-12-012-2/+2
|\ \ \ | |/ / | | | | | | into kinetic-declarativeui
| * | Make focusOnPress the default behaviour for TextEdit (like TextInput).Michael Brasser2009-12-012-2/+2
| |/
* | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2009-12-013-8/+19
|\ \ | |/ | | | | into kinetic-declarativeui
| * Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-3034-643/+522
| |\ | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/corelib/animation/qabstractanimation.cpp
| | * Fixed build on S60 and WinCEThorbjørn Lindeijer2009-11-301-1/+1
| | | | | | | | | | | | | | | Since qreal is a float on these targets, it was having trouble picking the right version of qMax.
| * | unwarnWarwick Allison2009-11-301-2/+2
| | |
| * | Fix PropertyAction crash.Martin Jones2009-11-301-5/+16
| | | | | | | | | | | | | | | It is possible for the animation to stop while in doAction(), which would then delete the animations we were running.
* | | Merge branch 'kinetic-declarativeui' of /Users/akennedy/Qt/kinetic2 into ↵Aaron Kennedy2009-11-3034-643/+522
|\ \ \ | | | | | | | | | | | | kinetic-declarativeui
| * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiAaron Kennedy2009-11-3034-643/+522
| |\ \ \ | | |/ / | |/| / | | |/ | | | Conflicts: src/corelib/animation/qabstractanimation.cpp
| | * Merge remote branch 'staging/4.6' into 4.6Oswald Buddenhagen2009-11-272-32/+63
| | |\
| | | * Improved and optimized the WaveUnderlineThorbjørn Lindeijer2009-11-262-32/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The WaveUnderline used to be a series of 180 degree arcs, that didn't always align very well between different text items and that could be clipped at the bottom since the font height got reduced. Now it uses quad beziers so that it is more like a sinus curve, and the alignment and clipping issues have been fixed. The painting of the WaveUnderline has been optimized using QPixmapCache. A 100 pixels wide sample of the wave is now cached as a pixmap and repeated to draw the WaveUnderline. This is an order of magnitude faster than rasterizing a QPainterPath. The QPlainTextEdit needs to set the brush origin since it draws the text items in local widget coordinates, rather than relying on a painter translation like the QTextEdit. Done with mae.
| | * | Merge commit oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-2732-610/+461
| | |\ \
| | | * | Fixed memory leak in QImagePixmapCleanupHooks.Kim Motoyoshi Kalland2009-11-272-23/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QImagePixmapCleanupHooks instance was never deleted. Fixed by making it a Q_GLOBAL_STATIC. Task-number: QTBUG-6116 Reviewed-by: Trond
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Eskil Abrahamsen Blomfeldt2009-11-271-12/+0
| | | |\ \
| | | | * | Fix infinite recursion in OpenVG scissor-only clippingRhys Weatherley2009-11-271-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a complex transform was set, clip(QVectorPath) would call clip(QRect) with the control point rect, which would then turn around and say "transform is complex, call clip(QVectorPath)", causing an infinite loop until stack crash. Remove the "fall back to vector path" case as it isn't useful for scissor-only clipping. Doesn't affect mask-based clipping. Reviewed-by: Sarah Smith
| | | * | | Fix compilation on Windows CEEskil Abrahamsen Blomfeldt2009-11-272-0/+4
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 6ef5b4485b9fe5a9d25d2d9b5e67f110fb728a8b broke compilation on Windows CE by moving code out from a #ifndef Q_WS_WINCE block. Reviewed-by: Rohan McGovern
| | | * | QSortProxyModel: Crash when changing model with 2-level proxy and selected itemsGabriel de Dietrich2009-11-261-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The index mapping to the base model was being cleared before the persistant model indices. Reviewed-by: Olivier Task-number: QTBUG-6237
| | | * | Don't crash via proxy model when moving QModelIndexesStephen Kelly2009-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The layoutAboutToBeChanged signal gives proxies a chance to persist QModelIndexes. The d->itemsAboutToBeMoved method is part of the process of moving the persistent indexes. d->itemsAboutToBeMoved must be called after layoutAboutToBeChanged. Otherwise persistent indexes will not be updated. Merge-request: 2219 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| | | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-267-67/+68
| | | |\ \ | | | | | | | | | | | | | | | | | | 4.6-staging2
| | | | * | Fixed context menu placement partially outside screen bug in Symbian.Janne Anttila2009-11-261-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In style demo example when spinbox was long tapped, the context menu was placed partially outside screen. The preconditions for bug were: 1. Tap position is near screen right edge 2. Minimum space width requested by context menu is > sreen width The new (simplified) logic is as follows: 1. If menus right edge in requested position is outside screen right edge, the menu is moved to left enough to fit on screen. i.e. if (tap position + menu width > screen right ) x = screen right - menu width 2. As a result of above statement the x position might go outside left boundary of screen. This is fixed by next statements if( x < screen left ) x = screen left Task-number: QTBUG-6164 Reviewed-by: Alessandro Portale
| | | | * | Tidyup QS60Style - remove unused constants, replace magic valuesSami Merilä2009-11-262-12/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically this has three minor fixes: - remove unused style parts that were left over after unifying textEdit and lineEdit graphics - make radiobutton indicator one pixel smaller so it is perfect circle - replace magic "10" with calculated value Reviewed-by: Alessandro Portale
| | | | * | Background in landscape mode on S60 5.0 is brokenSami Merilä2009-11-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After initial fix, 99% of widgets draw temselves properly after orientation switch. However, QScrollAreas lose their palette hash, which causes scrollarea background to re-start from theme background top-left. As a correction, we re-set the theme palette hash after calling QApplication::setPalette, since that clears palette hash. Task-number: QTBUG-6125 Reviewed-by: Alessandro Portale
| | | | * | Remove some white-space from QS60StyleSami Merilä2009-11-261-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove some white space from QS60Style classes. Reviewed-by: TrustMe
| | | | * | Fixing background painting after orientation switch.Alessandro Portale2009-11-252-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing previous fixes of QS60StylePrivate::setBackgroundTexture with commit SHAs a80e58335e69c8ce96d1596e0ed2d14e424a0d5e and d4089399a3ab7548a864d5a399e08df85c444783 Now, the palette gets the updated background brush and the palette is actually set as application palette. Also making sure that QS60StylePrivate::handleDynamicLayoutVariantSwitch does the right things in the right order. So that Table headers are not broken after orientaion switch. Task-number: QTBUG-6125 Task-number: QT-1478
| | | | * | Micro optimizationAlessandro Portale2009-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't request a palette if you do not use it. Reviewed-By: Trustme
| | | | * | Fixed context menu not to have "Options" action.Janne Anttila2009-11-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling QMainWindow::setMenuBar(), menuBarAction ("Options") gets added to widget actions list. This actions will be shown in widget context menu if visible. That's why we set the action invisible. Visibility property does not have impact to softkey contruction, i.e. also invisble softkeys are added. Task-number: QTBUG-6220 Reviewed-by: Jason Barron
| | | | * | Fixes for tab/space usage in qwidget.cpp.Janne Anttila2009-11-251-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2009-11-253-28/+35
| | | | |\ \
| | | | | * | Removed unused setThemePalette(QStyleOption *option)Alessandro Portale2009-11-252-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not used or missed, anywhere. Reviewed-By: Trustme
generated by cgit v0.12 at 2024-11-12 06:45:41 (GMT)