Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Let the 'qml' runtime use its applicationDirPath as importsPath | mae | 2010-03-02 | 1 | -0/+3 |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-03-02 | 1 | -2/+2 |
|\ | |||||
| * | Merge branch 'master' into 4.7 | Aaron Kennedy | 2010-03-02 | 1 | -2/+2 |
| |\ | |||||
| | * | Make "on" syntax mandatory for value sources and interceptors | Aaron Kennedy | 2010-03-02 | 1 | -2/+2 |
* | | | qdoc: Second attempt, QML doc stuff. | Martin Smith | 2010-03-02 | 7 | -36/+79 |
|/ / | |||||
* | | Fixed the close button of the find widget in Assistant | Thorbjørn Lindeijer | 2010-03-01 | 1 | -0/+1 |
* | | build fix for WinCE | Maurice Kalinowski | 2010-03-01 | 1 | -1/+3 |
* | | doc: Fixed building documentation | Thorbjørn Lindeijer | 2010-03-01 | 1 | -0/+0 |
|/ | |||||
* | Fix compile warning | Aaron Kennedy | 2010-03-01 | 1 | -1/+1 |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-27 | 1 | -1/+10 |
|\ | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-27 | 1 | -1/+10 |
| |\ | |||||
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-26 | 1 | -1/+10 |
| | |\ | |||||
| | | * | Merge branch 'master' of git:qt/qt-multimedia-staging into qml | Thiago Macieira | 2010-02-26 | 1 | -1/+10 |
| | | |\ | |||||
| | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-26 | 1 | -1/+10 |
| | | | |\ | |||||
| | | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-25 | 1 | -1/+10 |
| | | | | |\ | |||||
| | | | | | * | Test for the existance of the Windows Media SDK in configure. | Andrew den Exter | 2010-02-25 | 1 | -1/+10 |
* | | | | | | | Merge remote branch 'origin/master' into 4.7 | Thiago Macieira | 2010-02-27 | 31 | -262/+302 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | 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 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 branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 | Martin Smith | 2010-02-26 | 14 | -77/+135 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | 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 remote branch 'origin/master' | Olivier Goffart | 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 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| * | | | | | 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 |