Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | clean up project files | Oswald Buddenhagen | 2009-12-03 | 9 | -297/+305 |
| | |||||
* | Added conditional macro which will make the copy in QtCreator able to export ↵ | Erik Verbruggen | 2009-12-03 | 8 | -110/+120 |
| | | | | the classes across shared libraries/plug-ins. | ||||
* | Optimization: Use linked-list for context objects | Aaron Kennedy | 2009-12-03 | 4 | -15/+25 |
| | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-12-03 | 15 | -167/+197 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Optimization: Use QString, not QUrl in QmlBinding | Aaron Kennedy | 2009-12-03 | 8 | -21/+21 |
| | | |||||
| * | Avoid QString <-> QUrl conversions | Aaron Kennedy | 2009-12-03 | 4 | -3/+15 |
| | | |||||
| * | Remove dead code | Aaron Kennedy | 2009-12-03 | 1 | -11/+0 |
| | | |||||
| * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Aaron Kennedy | 2009-12-03 | 10 | -48/+120 |
| |\ | | | | | | | | | | into kinetic-declarativeui | ||||
| * | | Optimization | Aaron Kennedy | 2009-12-03 | 8 | -137/+166 |
| | | | |||||
* | | | Minor optimization for layout. | Martin Jones | 2009-12-03 | 1 | -21/+34 |
| |/ |/| | |||||
* | | A collection of small optimizations. | Martin Jones | 2009-12-03 | 8 | -28/+79 |
| | | |||||
* | | Positioner optimizations. | Michael Brasser | 2009-12-03 | 2 | -34/+46 |
| | | |||||
* | | Plug leak. | Martin Jones | 2009-12-03 | 2 | -0/+9 |
|/ | |||||
* | Fix test failure. | Warwick Allison | 2009-12-02 | 1 | -2/+2 |
| | | | | That +1 was a typo (the qCeil is already sufficient to bound to int rect). | ||||
* | Undo most of 913dd563064e8047fe738fc9c79135adfb928977 | Warwick Allison | 2009-12-02 | 197 | -523/+523 |
| | | | | It seems we're going to have to so a syncqt/configure in Qt modules. | ||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-12-02 | 124 | -338/+414 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Fix indenting | Aaron Kennedy | 2009-12-02 | 1 | -6/+6 |
| | | |||||
| * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Aaron Kennedy | 2009-12-02 | 124 | -333/+379 |
| |\ | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: src/declarative/qml/qmlvme.cpp | ||||
| | * | Fix initial scaling. QWebPage::setPreferredSize doesn't really work. | Warwick Allison | 2009-12-02 | 1 | -6/+0 |
| | | | |||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-12-02 | 25 | -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 Allison | 2009-12-02 | 5 | -32/+85 |
| | | | | | | | | | | | | | | | | Uses a fixed zoomFactor of 4 to allow sufficient sub-"pixel" precision. | ||||
| | * | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-12-01 | 3 | -6/+138 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-12-01 | 2 | -2/+2 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | Remove include styles that rely on configure. | Warwick Allison | 2009-12-01 | 122 | -298/+297 |
| | | | | | | | | | | | | | | | | | | | | | | | | May help modularization (syncqt and configure are Qt-specific). | ||||
| * | | | | | Minor performance tweaks | Aaron Kennedy | 2009-12-02 | 2 | -6/+36 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Update header & footer pos when items inserted. | Martin Jones | 2009-12-02 | 1 | -0/+2 |
|/ / / / | |||||
* | | | | Delay the creation of the signal parameter object until needed | Aaron Kennedy | 2009-12-02 | 2 | -12/+14 |
| | | | | |||||
* | | | | Run QmlParserStatus::componentComplete() in opposite order | Aaron Kennedy | 2009-12-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | This improves perf when a parent depends on its childrens' size. | ||||
* | | | | Cleanup cached binding closures | Aaron Kennedy | 2009-12-02 | 4 | -14/+19 |
| | | | | |||||
* | | | | Cache binding closures | Aaron Kennedy | 2009-12-02 | 11 | -16/+118 |
| | | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Aaron Kennedy | 2009-12-02 | 8 | -13/+204 |
|\ \ \ \ | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| * \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-12-02 | 1 | -1/+4 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | Get qsTr and friends working again. | Michael Brasser | 2009-12-01 | 1 | -1/+4 |
| | | |_|/ | | |/| | | |||||
| * | | | | Allow Flickable direction to be set explicitly. | Martin Jones | 2009-12-02 | 5 | -6/+62 |
| |/ / / | |||||
| * | | | Fix jumpy EaseFollow animations | Martin Jones | 2009-12-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Task-number: QTBUG-5766 | ||||
| * | | | Add header and footer to ListView. | Martin Jones | 2009-12-01 | 2 | -5/+137 |
| | |/ | |/| | |||||
* | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Aaron Kennedy | 2009-12-01 | 2 | -2/+2 |
|\ \ \ | |/ / | | | | | | | into kinetic-declarativeui | ||||
| * | | Make focusOnPress the default behaviour for TextEdit (like TextInput). | Michael Brasser | 2009-12-01 | 2 | -2/+2 |
| |/ | |||||
* | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Aaron Kennedy | 2009-12-01 | 3 | -8/+19 |
|\ \ | |/ | | | | | into kinetic-declarativeui | ||||
| * | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵ | Warwick Allison | 2009-11-30 | 34 | -643/+522 |
| |\ | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/corelib/animation/qabstractanimation.cpp | ||||
| | * | Fixed build on S60 and WinCE | Thorbjørn Lindeijer | 2009-11-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Since qreal is a float on these targets, it was having trouble picking the right version of qMax. | ||||
| * | | unwarn | Warwick Allison | 2009-11-30 | 1 | -2/+2 |
| | | | |||||
| * | | Fix PropertyAction crash. | Martin Jones | 2009-11-30 | 1 | -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 Kennedy | 2009-11-30 | 34 | -643/+522 |
|\ \ \ | | | | | | | | | | | | | kinetic-declarativeui | ||||
| * \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Aaron Kennedy | 2009-11-30 | 34 | -643/+522 |
| |\ \ \ | | |/ / | |/| / | | |/ | | | | Conflicts: src/corelib/animation/qabstractanimation.cpp | ||||
| | * | Merge remote branch 'staging/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-27 | 2 | -32/+63 |
| | |\ | |||||
| | | * | Improved and optimized the WaveUnderline | Thorbjørn Lindeijer | 2009-11-26 | 2 | -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.6 | Olivier Goffart | 2009-11-27 | 32 | -610/+461 |
| | |\ \ | |||||
| | | * | | Fixed memory leak in QImagePixmapCleanupHooks. | Kim Motoyoshi Kalland | 2009-11-27 | 2 | -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.6 | Eskil Abrahamsen Blomfeldt | 2009-11-27 | 1 | -12/+0 |
| | | |\ \ |