summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-04516-4591/+14474
|\
| * Re-apply change fa1856bcb2eff41dadf0900202dd43f44ddb2343 by Joerg BornemannJoerg Bornemann2009-11-031-0/+11
| * Re-apply change 71913d435213188959441a89454de6308fd76484 by Jocelyn TurcotteJocelyn Turcotte2009-11-031-23/+0
| * Re-apply change 6bc9ef388590b4bfb281d2e1510dc7c3d1837349 by Shane KearnsShane Kearns2009-11-031-0/+15
| * Re-apply change 6f36d0aafaccbb9affe8ac1b82c225d985aa7491 by David BoddieDavid Boddie2009-11-031-0/+17
| * Re-apply change e2ef97128c006ac2a5c99c67bb54eebaa3b45720 by Thiago MacieiraThiago Macieira2009-11-031-0/+37
| * Re-apply change 3f7a99565de7ed17d7ac4c0a25b02997b094b1a9 by Thiago MacieiraThiago Macieira2009-11-031-1/+2
| * Re-apply change 0e917ae9587aa0727e6b26ba3eb0157362748fb7 by Jocelyn TurcotteJocelyn Turcotte2009-11-032-107/+107
| * Re-apply change 37dc859e7e2e0f135e4c40bc7f6f824fcdb21e86 by David BoddieDavid Boddie2009-11-032-7/+91
| * Re-apply change 4ce556b952545494a8adb96f628c219a38406562 by Oswald BuddenhagenOswald Buddenhagen2009-11-031-1/+1
| * Re-apply change cef1901dbd96be81fc4139b50b094dfae5223e6f by Martin SmithMartin Smith2009-11-031-1/+1
| * Re-apply change 6125aabeccb01a07c706fe4227279eb827e8e890 by Jocelyn TurcotteJocelyn Turcotte2009-11-031-2/+6
| * Updated WebKit from /home/jturcott/dev/webkit/ to qtwebkit-4.6-snapshot-20091...Jocelyn Turcotte2009-11-03492-4844/+14466
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-034-6/+6
| |\
| | * Doc/i18n: Fixed source strings for translation.David Boddie2009-11-033-5/+5
| | * Doc: Fixed license information.David Boddie2009-11-031-1/+1
| * | WebKit compile fix for Windows CEJoerg Bornemann2009-11-031-0/+11
| * | Merge commit 'origin/4.6' into featureJørgen Lind2009-11-022-4/+22
| |\ \
| | * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into origin-4.6Olivier Goffart2009-10-301-0/+15
| | |\ \
| | | * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6axis2009-10-291-23/+0
| | | |\ \
| | | * | | Fix to 8e0fbc2caa3edefb78d6667721235b783bc1a850Shane Kearns2009-10-281-0/+15
| | | | |/ | | | |/|
| | * | | Merge commit origin/4.6 into team-widgets/4.6Olivier Goffart2009-10-294-37/+56
| | |\ \ \ | | | | |/ | | | |/|
| * | | | Fix QT_NO_PHONON_VIDEOJørgen Lind2009-10-298-8/+17
| * | | | Fix LIBRARY and SETTINGS in phononJørgen Lind2009-10-297-6/+37
| * | | | Fix QT_NO_PROPERTIESJørgen Lind2009-10-292-2/+4
| * | | | Added QT_NO_PHONON_EFFECT to gstreamer backendJørgen Lind2009-10-295-8/+10
| * | | | Fix QT_NO_PHONON_ABSTRACTMEDIASTREAM in phononJørgen Lind2009-10-295-1/+41
| * | | | Fix QFeature QT_NO_PHONON_VOLUMEFADEREFFECTJørgen Lind2009-10-293-4/+8
| * | | | Make QT_NO_PHONON_PLATFORMPLUGIN workJørgen Lind2009-10-291-3/+4
| | |/ / | |/| |
* | | | Fix crash.Warwick Allison2009-11-021-9/+1
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-widget-team into kinet...Aaron Kennedy2009-10-291-4/+7
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'fixes' of git://gitorious.org/~fleury/qt/fleury-openbossa-clone...Jan-Arve Sæther2009-10-281269-11662/+33827
| |\ \ \
| * | | | Phonon: allows to stream wave files from QIODeviceThierry Bastian2009-10-231-4/+7
* | | | | Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2009-10-294-37/+56
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Delete the tst_QWebFrame::setHtmlWithBaseURL test until its fixedJocelyn Turcotte2009-10-281-23/+0
| | |_|/ | |/| |
| * | | Revert "Re-apply change 8e0fbc2caa3edefb78d6667721235b783bc1a850 by Iain"Iain2009-10-261-13/+0
| * | | Doc: Added internal or hidden placeholder documentation.David Boddie2009-10-261-0/+17
| * | | Implement symbol hiding for JSC's JIT functions.Thiago Macieira2009-10-261-0/+37
| * | | Fix linking of WebKit on Linux 32-bit.Thiago Macieira2009-10-261-1/+2
| | |/ | |/|
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-10-251359-45303/+94012
|\ \ \ | |/ /
| * | Correct line ending chars imported from webkit.Jocelyn Turcotte2009-10-232-107/+107
| * | Doc: Fixed and synchronized QWebView related documentation.David Boddie2009-10-232-7/+91
| * | fix line endingOswald Buddenhagen2009-10-231-1/+1
| * | Temporary fix in qt.git to allow build on s60.Jocelyn Turcotte2009-10-221-1/+3
| * | Temporary fix in qt.git to allow build on s60.Jocelyn Turcotte2009-10-221-0/+5
| * | Re-apply change 0f8bff1970d4b0f10e98ce7d6ab341620f4ce76b by Martin SmithMartin Smith2009-10-221-1/+1
| * | Re-apply change 8e0fbc2caa3edefb78d6667721235b783bc1a850 by IainIain2009-10-221-0/+13
| * | Re-apply change 6b8ac349b9a477863a8c8388dcc0658f3284bc54 by Jocelyn TurcotteJocelyn Turcotte2009-10-221-2/+6
| * | Updated WebKit from /home/jturcott/dev/webkit/ to qtwebkit-4.6-snapshot-22102...Jocelyn Turcotte2009-10-221270-11675/+33732
| |/
| * Qt patches to libpng sources.aavit2009-10-221-2/+12