summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* clean up project filesOswald Buddenhagen2009-12-039-297/+305
|
* Added conditional macro which will make the copy in QtCreator able to export ↵Erik Verbruggen2009-12-038-110/+120
| | | | the classes across shared libraries/plug-ins.
* Optimization: Use linked-list for context objectsAaron Kennedy2009-12-034-15/+25
|
* Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-12-0315-167/+197
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Optimization: Use QString, not QUrl in QmlBindingAaron Kennedy2009-12-038-21/+21
| |
| * Avoid QString <-> QUrl conversionsAaron Kennedy2009-12-034-3/+15
| |
| * Remove dead codeAaron Kennedy2009-12-031-11/+0
| |
| * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2009-12-0310-48/+120
| |\ | | | | | | | | | into kinetic-declarativeui
| * | OptimizationAaron Kennedy2009-12-038-137/+166
| | |
* | | Minor optimization for layout.Martin Jones2009-12-031-21/+34
| |/ |/|
* | A collection of small optimizations.Martin Jones2009-12-038-28/+79
| |
* | Positioner optimizations.Michael Brasser2009-12-032-34/+46
| |
* | Plug leak.Martin Jones2009-12-032-0/+9
|/
* Fix test failure.Warwick Allison2009-12-021-2/+2
| | | | That +1 was a typo (the qCeil is already sufficient to bound to int rect).
* Undo most of 913dd563064e8047fe738fc9c79135adfb928977Warwick Allison2009-12-02197-523/+523
| | | | It seems we're going to have to so a syncqt/configure in Qt modules.
* 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
| | | |\ \