Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Martin Jones | 2009-12-07 | 14 | -187/+302 |
|\ | | | | | | | into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-12-07 | 7 | -105/+160 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Move target/property functions to their appropriate classes. | Michael Brasser | 2009-12-07 | 3 | -59/+112 |
| | | | |||||
| | * | Minor cleanup/optimization. | Michael Brasser | 2009-12-07 | 5 | -24/+28 |
| | | | |||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-12-07 | 1 | -1/+1 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-12-07 | 35 | -286/+336 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | Cleanup. | Michael Brasser | 2009-12-04 | 2 | -22/+20 |
| | | | | | |||||
| * | | | | Fix spurious logging problems. | Warwick Allison | 2009-12-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | (printf patterns would be expanded!) | ||||
| * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-12-07 | 1 | -1/+1 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | valueChanged() needs to be virtual? | Yann Bodson | 2009-12-07 | 1 | -1/+1 |
| | | |/ | | |/| | |||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-12-06 | 32 | -214/+206 |
| |\ \ \ | | |/ / | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Make QmlScriptEngine reusable in WorkScript, so extra fns are available. | Warwick Allison | 2009-12-04 | 5 | -80/+137 |
| | | | | | | | | | | | | | | | | Add Qt.resolvedUrl(url) | ||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-12-04 | 1 | -45/+102 |
| |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Stuff for package install. | Warwick Allison | 2009-12-04 | 1 | -0/+3 |
| | | | | | |||||
* | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Martin Jones | 2009-12-07 | 32 | -214/+206 |
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | into kinetic-declarativeui | ||||
| * | | | | oops, fix the compilation | Thierry Bastian | 2009-12-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | small cleanup | Thierry Bastian | 2009-12-04 | 31 | -210/+202 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make use of QVariant::userType over Qvariant::type make use of char for 1-string character QCoreApplication::translate is static | ||||
| * | | | | Use QVariant::toReal() instead of QVariant::toDouble() | Thierry Bastian | 2009-12-04 | 3 | -5/+5 |
| | |/ / | |/| | | | | | | | | | | This avoids conversions from flat to double en embedded. | ||||
* | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Martin Jones | 2009-12-04 | 1 | -45/+102 |
|\ \ \ \ | |/ / / | | | | | | | | | into kinetic-declarativeui | ||||
| * | | | Remove debug | Martin Jones | 2009-12-04 | 1 | -2/+0 |
| | | | | |||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-12-04 | 1 | -0/+7 |
| |\ \ \ | | |/ / | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Fix item insertion/deletion before first visible item. | Martin Jones | 2009-12-04 | 1 | -45/+104 |
| | | | | | | | | | | | | | | | | Also avoid destroying items in the same frame as adding items. | ||||
* | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Martin Jones | 2009-12-04 | 1 | -0/+7 |
|\ \ \ \ | | |/ / | |/| | | | | | | into kinetic-declarativeui | ||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-12-04 | 3 | -26/+18 |
| |\ \ \ | | |/ / | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | undebug | Warwick Allison | 2009-12-04 | 1 | -1/+0 |
| | | | | |||||
| * | | | Prevent call to executeSql outside transaction (eg. if arg kept). | Warwick Allison | 2009-12-04 | 1 | -0/+8 |
| | | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Martin Jones | 2009-12-04 | 1 | -2/+1 |
|\ \ \ \ | | |/ / | |/| | | | | | | into kinetic-declarativeui | ||||
| * | | | Delete released items immediately. | Martin Jones | 2009-12-04 | 1 | -2/+1 |
| | | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Martin Jones | 2009-12-04 | 1 | -2/+0 |
|\ \ \ \ | |/ / / | | | | | | | | | into kinetic-declarativeui | ||||
| * | | | Revert 1dd1886390f56810f3fffbc66e823dca9132a89c - wasn't a leak. | Martin Jones | 2009-12-04 | 1 | -2/+0 |
| | | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Martin Jones | 2009-12-04 | 243 | -1427/+1980 |
|\ \ \ \ | |/ / / | | | | | | | | | into kinetic-declarativeui | ||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-12-04 | 257 | -1315/+1680 |
| |\ \ \ | | |/ / | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-12-04 | 7 | -50/+51 |
| | |\ \ | | | |/ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-12-03 | 257 | -1306/+1681 |
| | | |\ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | 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 |
| | | | | | |||||
| | * | | | Fix count change notification. | Warwick Allison | 2009-12-04 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-12-03 | 257 | -1494/+1971 |
| | |\ \ \ | | | | |/ | | | |/| | | | | | | 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 |
| | | | | | |||||
| | * | | | More detailed error message. | Warwick Allison | 2009-12-03 | 1 | -2/+3 |
| | | | | | |||||
| * | | | | Fix overshoot correction in ListView with variable height items. | Martin Jones | 2009-12-04 | 1 | -22/+17 |
| | |/ / | |/| | | |||||
| * | | | 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 |