Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast... | Qt Continuous Integration System | 2010-02-26 | 5 | -12/+12 |
|\ | |||||
| * | Merge remote branch 'origin/master' into berlin-master | Joerg Bornemann | 2010-02-26 | 39 | -325/+421 |
| |\ | |||||
| * | | fix "configure -fast" on Windows for other maketools than nmake | Joerg Bornemann | 2010-02-26 | 1 | -1/+1 |
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast... | Qt Continuous Integration System | 2010-02-24 | 4 | -11/+11 |
| |\ \ | |||||
| | * | | Assistant: Make ~AbstractHelpViewer() virtual. | ck | 2010-02-24 | 1 | -1/+1 |
| | * | | tr()-Fixes in Assistant/QHelpLib code. | Friedemann Kleint | 2010-02-24 | 3 | -10/+10 |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-... | Qt Continuous Integration System | 2010-02-26 | 2 | -2/+4 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Merge branch '4.6' | Miikka Heikkinen | 2010-02-26 | 2 | -2/+4 |
| |\ \ \ | |||||
| | * | | | Fix for cetest. | David Laing | 2010-02-26 | 2 | -2/+4 |
* | | | | | Merge remote branch 'qt/master' into qml-master | Qt Continuous Integration System | 2010-02-26 | 18 | -211/+262 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-25 | 9 | -72/+123 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 | David Boddie | 2010-02-25 | 9 | -72/+49 |
| | |\ \ \ \ | |||||
| | | * | | | | Revert "qdoc: Finished "Inherited by" list for QML elements." | Andreas Aardal Hanssen | 2010-02-25 | 6 | -44/+35 |
| | | * | | | | Revert "qdoc: List new QML elements in \sincelist for What's New page." | Andreas Aardal Hanssen | 2010-02-25 | 2 | -28/+2 |
| | | | |/ / | | | |/| | | |||||
| | * | | | | Doc: Added a config file for creating Simplified Chinese docs directly. | David Boddie | 2010-02-25 | 2 | -1/+87 |
| | | |_|/ | | |/| | | |||||
* | | | | | Merge branch 'master' of git:qt/qt-qml | Thiago Macieira | 2010-02-25 | 42 | -397/+435 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Merge branch 'master' of ../../qt/master | Justin McPherson | 2010-02-24 | 2 | -1/+13 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Add support for qml imports directory in configure, qmake, and qmlengine | mae | 2010-02-24 | 1 | -1/+15 |
| * | | | | Simplify QML element registration headers | Aaron Kennedy | 2010-02-24 | 2 | -0/+4 |
| * | | | | Compile warning-- for qmlviewer | Leonardo Sobral Cunha | 2010-02-24 | 1 | -1/+0 |
| * | | | | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to QDec... | Warwick Allison | 2010-02-24 | 42 | -396/+396 |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-24 | 14 | -63/+634 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Martin Jones | 2010-02-24 | 14 | -63/+634 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-23 | 2 | -4/+4 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Avoiding PlatSec warnings for Symbian devices | Aleksandar Sasha Babic | 2010-02-23 | 1 | -1/+1 |
| | * | | | | Remove QmlView::execute(). QmlView::setSource() does it all now. | Martin Jones | 2010-02-23 | 1 | -3/+3 |
| * | | | | | Remove QML_DEFINE_... macros, now use QML_REGISTER_... macros calls. | Warwick Allison | 2010-02-23 | 7 | -9/+30 |
| |/ / / / | |||||
* | | | | | Merge remote branch 'origin/master' | Olivier Goffart | 2010-02-24 | 2 | -1/+13 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Add -mediaservice argument to configure. | Andrew den Exter | 2010-02-24 | 2 | -1/+13 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Rhys Weatherley | 2010-02-24 | 4 | -0/+522 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-... | Qt Continuous Integration System | 2010-02-23 | 4 | -0/+522 |
| |\ \ \ | |||||
| | * | | | Factored epocRoot implementation out of qmake | Gareth Stockwell | 2010-02-23 | 2 | -0/+297 |
| | * | | | Factored readRegistryKey implementation out of qmake | axis | 2010-02-23 | 2 | -0/+225 |
| | |/ / | |||||
* | | | | Separate Phonon and gstreamer defines in qtconfig | Rhys Weatherley | 2010-02-23 | 2 | -2/+9 |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-02-23 | 3 | -3/+3 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | improve 64 bit support on windows | Thierry Bastian | 2010-02-23 | 2 | -2/+2 |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-02-23 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Fix compilation | Olivier Goffart | 2010-02-22 | 1 | -1/+1 |
* | | | | Merge remote branch 'origin/master' | Thiago Macieira | 2010-02-23 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-22 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Rename MouseRegion -> MouseArea | Martin Jones | 2010-02-22 | 1 | -2/+2 |
* | | | | qdoc: List new QML elements in \sincelist for What's New page. | Martin Smith | 2010-02-22 | 2 | -2/+28 |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-22 | 10 | -62/+85 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge branch 'master' of git:qt/qt | Thiago Macieira | 2010-02-21 | 27 | -197/+927 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote branch 'origin/master' | Thiago Macieira | 2010-02-20 | 61 | -3211/+878 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 | David Boddie | 2010-02-19 | 6 | -35/+44 |
| |\ \ \ \ \ | |||||
| | * | | | | | qdoc: Finished "Inherited by" list for QML elements. | Martin Smith | 2010-02-19 | 6 | -35/+44 |
| * | | | | | | Doc: Simplified Commercial Editions for Qt 4.7. | David Boddie | 2010-02-19 | 6 | -52/+0 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 | Martin Smith | 2010-02-18 | 6 | -5/+22 |
| |\ \ \ \ \ | |||||
| * | | | | | | qdoc: Added "Inherited by" list to QML elements. | Martin Smith | 2010-02-18 | 5 | -10/+76 |