summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2010-10-294-5/+8
|\
| * Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-263-17/+4
| |\
| * \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2222-62/+632
| |\ \
| * \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-0547-6864/+339
| |\ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-2726-3343/+619
| |\ \ \ \
| * \ \ \ \ Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-09-133-5/+7
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'qt-4.7' into lighthouse-4.7Paul Olav Tvete2010-09-1315-61/+403
| | |\ \ \ \ \
| | * | | | | | Make phonon gst backend build properlyJørgen Lind2010-09-073-5/+7
| * | | | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-09-1316-65/+403
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-08-197-140/+64
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-08-1922-189/+242
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-1923-78/+207
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouseJørgen Lind2010-08-03119-881/+13671
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-07-14119-416/+2030
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouseJørgen Lind2010-06-2492-6431/+3226
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Adding -qpa configure switchJørgen Lind2010-06-241-1/+1
| * | | | | | | | | | | | Merge remote branch 'qt/4.7' into lighthousePaul Olav Tvete2010-06-18150-1166/+5139
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-05-10133-2491/+5889
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.7' into lighthouseJørgen Lind2010-04-213860-160217/+334824
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-18342-9119/+21938
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.7' into 4.7-lighthouseJørgen Lind2010-03-1120-1116/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-01450-62623/+63023
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'remotes/qt/4.6' into lighthousePaul Olav Tvete2010-02-1044-166/+785
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.6' into lighthousePaul Olav Tvete2010-01-14117-933/+4752
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.6' into lighthousePaul Olav Tvete2009-11-191792-51810/+114269
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' into lighthousePaul Olav Tvete2009-10-141043-3378/+8326
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | check for lighthouse when configuring webkit - if so, exclude X11Jeremy Katz2009-10-051-0/+1
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-271-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Phonon MMF backend: set _q_DummyWindowSurface property on VideoWidgetGareth Stockwell2010-10-261-0/+2
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-261-14/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | Phonon MMF backend: removed redundant trace outputGareth Stockwell2010-10-251-14/+0
* | | | | | | | | | | | | | | | | | | | | | | Handle Objective-C/C++ sources in SOURCES gracefullyTor Arne Vestbø2010-10-201-3/+3
* | | | | | | | | | | | | | | | | | | | | | | windef.h needs to be include before types.h for Windows Embedded 7Oliver Gutbrod2010-10-201-0/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Apply WebKit revision 60451 manually to fix Clang build issueTor Arne Vestbø2010-10-151-1/+1
* | | | | | | | | | | | | | | | | | | | | | Phonon: Export ObjectDescriptionModel to prevent link errors with ClangTor Arne Vestbø2010-10-151-1/+2
* | | | | | | | | | | | | | | | | | | | | | Add some tests for Indic shaping in HarfbuzzEskil Abrahamsen Blomfeldt2010-10-111-0/+29
* | | | | | | | | | | | | | | | | | | | | | Fix several errors with shaping of Indic scriptsप्रविण सातपुते2010-10-111-9/+14
* | | | | | | | | | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-071-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-071-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | Fixes assert in QDeclarativeWebViewThomas Hartmann2010-10-061-1/+5
* | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-0717-50/+581
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-067-6/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | QtScript/JavaScriptCore: Backport random number generator seeding fixKent Hansen2010-10-057-6/+41
| * | | | | | | | | | | | | | | | | | | | | Added qmake check for presence of RHttpDownloadMgr headerGareth Stockwell2010-10-033-7/+30
| * | | | | | | | | | | | | | | | | | | | | Progressive download in Phonon MMF backend: integrated with playerGareth Stockwell2010-10-018-43/+211
| * | | | | | | | | | | | | | | | | | | | | Progressive download in Phonon MMF backend: added download managersGareth Stockwell2010-10-012-0/+305
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-0436-6859/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | Removing libconninet 3rdparty component.Aaron McCarthy2010-09-2835-6854/+0
| * | | | | | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2411-5/+332
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Clarified documentation of loadFinished() signal.Jerome Pasion2010-09-241-5/+7
generated by cgit v0.12 at 2024-11-10 21:01:00 (GMT)