Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-12-03 | 258 | -1306/+1684 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | fix includes | Oswald Buddenhagen | 2009-12-03 | 247 | -842/+1176 |
| | | | | | | | | | | | | | | | | | | | | | | | | - include headers from own directory with "" - include headers from own project without private/ - sort includes from most specific to most generic - make headers self-contained - some whitespace unification no attempt was made at making the qt includes consistent regarding the use of module names and forwarding headers. no attempt was made at sorting includes. | ||||
| * | 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 |
| | | |||||
| * | Compile | Aaron Kennedy | 2009-12-03 | 1 | -0/+3 |
| | | |||||
| * | 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 |
| | | | |||||
| * | | Minor optimization for layout. | Martin Jones | 2009-12-03 | 1 | -21/+34 |
| | | | |||||
* | | | Minor optimizations. | Michael Brasser | 2009-12-03 | 3 | -12/+14 |
| | | | |||||
* | | | Minor optimization of image lookup from cache. | Michael Brasser | 2009-12-03 | 1 | -34/+36 |
| | | | |||||
* | | | Cleanup. | Michael Brasser | 2009-12-03 | 3 | -4/+1 |
| |/ |/| | |||||
* | | 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 | ||||
| * | 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 |
| | | |||||
* | | Optimization | Aaron Kennedy | 2009-12-03 | 8 | -137/+166 |
|/ | |||||
* | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Aaron Kennedy | 2009-12-03 | 201 | -532/+533 |
|\ | | | | | | | into kinetic-declarativeui | ||||
| * | 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). | ||||
| * | Don't set size, that now crops tile in pixelCache. | Warwick Allison | 2009-12-02 | 1 | -2/+0 |
| | | |||||
| * | Expect warning. | Warwick Allison | 2009-12-02 | 1 | -0/+3 |
| | | |||||
| * | Update error message. | Warwick Allison | 2009-12-02 | 1 | -2/+2 |
| | | | | | | | | Still correct: just reporting other "end" of the loop. | ||||
| * | Update for change d406a899943c6d56d921bc290a009415a3c4eba5 | Warwick Allison | 2009-12-02 | 1 | -3/+3 |
| | | |||||
| * | 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. | ||||
* | | Separate out first time construction cost | Aaron Kennedy | 2009-12-03 | 1 | -1/+12 |
|/ | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-12-02 | 137 | -691/+696 |
|\ | | | | | | | 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 | 137 | -686/+661 |
| |\ | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: src/declarative/qml/qmlvme.cpp | ||||
| | * | Fix initial scaling. QWebPage::setPreferredSize doesn't really work. | Warwick Allison | 2009-12-02 | 2 | -9/+3 |
| | | | |||||
| | * | Restructure for easier re-use. | Warwick Allison | 2009-12-02 | 7 | -278/+276 |
| | | | |||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-12-02 | 33 | -286/+641 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmlmetatype.cpp | ||||
| | | * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Martin Jones | 2009-12-02 | 30 | -198/+635 |
| | | |\ | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | * | | Remove qlistmodelinterface.h duplicate | Martin Jones | 2009-12-02 | 3 | -87/+2 |
| | | | | | |||||
| | * | | | Change from scaling/zooming by zoomFactor to instead use painter scaling. | Warwick Allison | 2009-12-02 | 6 | -42/+107 |
| | | | | | | | | | | | | | | | | | | | | Uses a fixed zoomFactor of 4 to allow sufficient sub-"pixel" precision. | ||||
| | * | | | Compile as module. | Warwick Allison | 2009-12-02 | 2 | -0/+3 |
| | | | | | |||||
| | * | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-12-01 | 4 | -7/+139 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-12-01 | 7 | -5/+318 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | | Compile when in module. | Warwick Allison | 2009-12-01 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-12-01 | 1 | -60/+0 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-12-02 | 25 | -192/+573 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | | | 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 |
| | | | | | | | |||||
| * | | | | | | Compile | Aaron Kennedy | 2009-12-02 | 1 | -1/+1 |
| | | | | | | |