summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-05-047-129/+144
|\
| * QmlViewer: Translate UIKai Koehne2011-05-027-126/+142
| * Merge branch 'master' of ../qt-qml-stagingMichael Brasser2011-04-1492-7024/+24514
| |\
| * \ Merge ../qt-qml-stagingYann Bodson2011-03-296-88/+95
| |\ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtAlan Alpert2011-03-2341-2908/+1826
| |\ \ \
| * \ \ \ Merge branch 'master' of ../qt-qml-stagingYann Bodson2011-03-1637-38/+59
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-stagingMartin Jones2011-03-018-18/+42
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of ../qt-qml-stagingMartin Jones2011-02-17138-14484/+7920
| |\ \ \ \ \ \
| * | | | | | | Make -no-opengl exist on other platformsAlan Alpert2011-02-041-3/+2
* | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-05-039-199/+297
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-039-199/+297
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-05-029-199/+297
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | qdoc: Completed task QTBUG-18790Martin Smith2011-04-151-0/+2
| | | * | | | | | | | qdoc: Completed task QTBUG-18733Martin Smith2011-04-145-125/+74
| | | * | | | | | | | qdoc: Last commit before merge into master.Martin Smith2011-04-132-1/+27
| | | * | | | | | | | qdoc: Fixed license comment.Martin Smith2011-04-081-21/+7
| | | * | | | | | | | qdoc: Added missing copyright noticeMartin Smith2011-04-071-0/+41
| | | * | | | | | | | qdoc: Updated the QDoc manual.Martin Smith2011-04-071-5/+6
| | | * | | | | | | | qdoc: Updated the QDoc manual.Martin Smith2011-04-071-10/+13
| | | * | | | | | | | qdoc: Updated the QDoc manual.Martin Smith2011-04-071-38/+127
| | | * | | | | | | | qdoc: Updated the QDoc manual.Martin Smith2011-04-063-24/+23
| | | * | | | | | | | qdoc: Fixed QTBUG-18591Martin Smith2011-04-061-0/+2
* | | | | | | | | | | Merge earth-team into origin/4.8Olivier Goffart2011-05-033-7/+9
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-201-1/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Make QMLViewer startup animation stop after a whileAlan Alpert2011-04-191-1/+1
| * | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-202-6/+8
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-182-6/+8
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-151-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / /
| | | | * | | | | | | | | Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Sym...Tom Sutcliffe2011-04-141-1/+1
| | | | * | | | | | | | | QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp'Kai Koehne2011-04-141-1/+1
| | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-121-5/+7
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | fix detection of relative location informationOswald Buddenhagen2011-04-111-5/+7
* | | | | | | | | | | | | | Fix the build of configure.exe.Liang Qi2011-05-021-0/+2
* | | | | | | | | | | | | | Update the source file of configure.exe to enable QtConcurrent for SymbianLiang Qi2011-05-021-2/+0
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'symbian-socket-engine' of scm.dev.troll.no:qt/qt-symbian-networkShane Kearns2011-04-121-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' of scm.dev.troll.no:qt/qt-earth-team into symbian-socke...Shane Kearns2011-04-1168-7034/+11242
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'earth/master' into symbian-socket-engineShane Kearns2011-03-2540-81/+136
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'symbian-socket-engine' of scm.dev.troll.no:qt/qt-symbian-networ...Shane Kearns2011-03-081-4/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'qt/master' into symbian-socket-engineShane Kearns2011-02-071235-1308/+1406
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'qt/master' into symbian-socket-engineShane Kearns2010-12-1519-104/+156
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Symbian: Also force IPv6 on Windows configure.exeMarkus Goetz2010-12-081-0/+2
| | * | | | | | | | | | | | | | | | Symbian: Enable IPv6 again.Markus Goetz2010-12-081-4/+0
* | | | | | | | | | | | | | | | | | Merge earth-team into origin/master'Olivier Goffart2011-04-1258-318/+13797
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-04-092-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Designer: Allow promoted QWidget's to be buddies.Friedemann Kleint2011-04-081-1/+3
| | * | | | | | | | | | | | | | | | Designer: Specify 'notr' attribute for buttongroup name.Friedemann Kleint2011-04-081-0/+1
| * | | | | | | | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-092-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-092-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-082-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / / / / / / | | | | |/| | | | | | | | | | | | | |