Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-05-04 | 7 | -129/+144 |
|\ | |||||
| * | QmlViewer: Translate UI | Kai Koehne | 2011-05-02 | 7 | -126/+142 |
| * | Merge branch 'master' of ../qt-qml-staging | Michael Brasser | 2011-04-14 | 92 | -7024/+24514 |
| |\ | |||||
| * \ | Merge ../qt-qml-staging | Yann Bodson | 2011-03-29 | 6 | -88/+95 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Alan Alpert | 2011-03-23 | 41 | -2908/+1826 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of ../qt-qml-staging | Yann Bodson | 2011-03-16 | 37 | -38/+59 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-staging | Martin Jones | 2011-03-01 | 8 | -18/+42 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of ../qt-qml-staging | Martin Jones | 2011-02-17 | 138 | -14484/+7920 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Make -no-opengl exist on other platforms | Alan Alpert | 2011-02-04 | 1 | -3/+2 |
* | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-05-03 | 9 | -199/+297 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-03 | 9 | -199/+297 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7 | David Boddie | 2011-05-02 | 9 | -199/+297 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | qdoc: Completed task QTBUG-18790 | Martin Smith | 2011-04-15 | 1 | -0/+2 |
| | | * | | | | | | | | qdoc: Completed task QTBUG-18733 | Martin Smith | 2011-04-14 | 5 | -125/+74 |
| | | * | | | | | | | | qdoc: Last commit before merge into master. | Martin Smith | 2011-04-13 | 2 | -1/+27 |
| | | * | | | | | | | | qdoc: Fixed license comment. | Martin Smith | 2011-04-08 | 1 | -21/+7 |
| | | * | | | | | | | | qdoc: Added missing copyright notice | Martin Smith | 2011-04-07 | 1 | -0/+41 |
| | | * | | | | | | | | qdoc: Updated the QDoc manual. | Martin Smith | 2011-04-07 | 1 | -5/+6 |
| | | * | | | | | | | | qdoc: Updated the QDoc manual. | Martin Smith | 2011-04-07 | 1 | -10/+13 |
| | | * | | | | | | | | qdoc: Updated the QDoc manual. | Martin Smith | 2011-04-07 | 1 | -38/+127 |
| | | * | | | | | | | | qdoc: Updated the QDoc manual. | Martin Smith | 2011-04-06 | 3 | -24/+23 |
| | | * | | | | | | | | qdoc: Fixed QTBUG-18591 | Martin Smith | 2011-04-06 | 1 | -0/+2 |
* | | | | | | | | | | | Merge earth-team into origin/4.8 | Olivier Goffart | 2011-05-03 | 3 | -7/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-04-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-20 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Make QMLViewer startup animation stop after a while | Alan Alpert | 2011-04-19 | 1 | -1/+1 |
| * | | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-04-20 | 2 | -6/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-04-18 | 2 | -6/+8 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | |||||
| | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-15 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | |||||
| | | | * | | | | | | | | | Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Sym... | Tom Sutcliffe | 2011-04-14 | 1 | -1/+1 |
| | | | * | | | | | | | | | QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp' | Kai Koehne | 2011-04-14 | 1 | -1/+1 |
| | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-04-12 | 1 | -5/+7 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | fix detection of relative location information | Oswald Buddenhagen | 2011-04-11 | 1 | -5/+7 |
* | | | | | | | | | | | | | | Fix the build of configure.exe. | Liang Qi | 2011-05-02 | 1 | -0/+2 |
* | | | | | | | | | | | | | | Update the source file of configure.exe to enable QtConcurrent for Symbian | Liang Qi | 2011-05-02 | 1 | -2/+0 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'symbian-socket-engine' of scm.dev.troll.no:qt/qt-symbian-network | Shane Kearns | 2011-04-12 | 1 | -4/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'master' of scm.dev.troll.no:qt/qt-earth-team into symbian-socke... | Shane Kearns | 2011-04-11 | 68 | -7034/+11242 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'earth/master' into symbian-socket-engine | Shane Kearns | 2011-03-25 | 40 | -81/+136 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'symbian-socket-engine' of scm.dev.troll.no:qt/qt-symbian-networ... | Shane Kearns | 2011-03-08 | 1 | -4/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'qt/master' into symbian-socket-engine | Shane Kearns | 2011-02-07 | 1235 | -1308/+1406 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'qt/master' into symbian-socket-engine | Shane Kearns | 2010-12-15 | 19 | -104/+156 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | Symbian: Also force IPv6 on Windows configure.exe | Markus Goetz | 2010-12-08 | 1 | -0/+2 |
| | * | | | | | | | | | | | | | | | | Symbian: Enable IPv6 again. | Markus Goetz | 2010-12-08 | 1 | -4/+0 |
* | | | | | | | | | | | | | | | | | | Merge earth-team into origin/master' | Olivier Goffart | 2011-04-12 | 58 | -318/+13797 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast... | Qt Continuous Integration System | 2011-04-09 | 2 | -1/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | Designer: Allow promoted QWidget's to be buddies. | Friedemann Kleint | 2011-04-08 | 1 | -1/+3 |
| | * | | | | | | | | | | | | | | | | Designer: Specify 'notr' attribute for buttongroup name. | Friedemann Kleint | 2011-04-08 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-04-09 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-04-09 | 2 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-04-08 | 2 | -2/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / / / / / / | | | | |/| | | | | | | | | | | | | | |