summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Changelog fixJedrzej Nowacki2009-11-121-2/+1
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Morten Johan Sørvig2009-11-1217-27/+242
|\
| * xmlpatterns filetree example: make app a bundle on MacPeter Hartmann2009-11-121-1/+0
| * Merge branch 'qtwebkit-4.6' into osloStaging1-4.6Jocelyn Turcotte2009-11-1215-26/+236
| |\
| | * Re-apply change 945e079e60506e88435802d0a764c8b4121ad16f by Richard Moe Gusta...Richard Moe Gustavsen2009-11-121-1/+1
| | * Re-apply change f80c224ddd3c3c4a408c8f88e6cf5114ee107c89 by Joerg BornemannJoerg Bornemann2009-11-122-1/+6
| | * Re-apply change a6123418522a3865d462cb64022f567462603af1 by Thiago MacieiraThiago Macieira2009-11-121-0/+37
| | * Re-apply change d09f0e3949d4e705ef60516a9ccfacad736dff43 by Thiago MacieiraThiago Macieira2009-11-121-1/+2
| | * Re-apply change d0c5bcf3b5793e73a059dea083b0f9ea0b16bfb3 by David BoddieDavid Boddie2009-11-122-7/+91
| | * Updated WebKit from /home/jturcott/dev/webkit/ to qtwebkit/qtwebkit-4.6 ( 361...Jocelyn Turcotte2009-11-1217-159/+238
| | * Make README more accurate for Mac OS X.Jason McDonald2009-11-121-4/+8
| * | Cocoa: QColorDialog makes the application hangRichard Moe Gustavsen2009-11-121-0/+6
* | | Fix memory leak.Morten Johan Sørvig2009-11-121-0/+1
|/ /
* | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-12226-22307/+23870
|\ \ | |/
| * Phonon; Integrate changes to .desktop fileJustin McPherson2009-11-121-0/+42
| * Phonon; Integrate changes to cmake files.Justin McPherson2009-11-124-20/+38
| * Gstreamer: Do not assume that the list index is the same as the deviceJustin McPherson2009-11-121-2/+10
| * Gstreamer: Added DVD supportJustin McPherson2009-11-121-15/+19
| * Gstreamer: Do not assume that the list index is the same as the device id.Justin McPherson2009-11-121-4/+7
| * gstreamer: Set the glib app name only once and do it in the backend.Justin McPherson2009-11-122-1/+7
| * Gstreamer: Detect more mimetypesJustin McPherson2009-11-121-2/+9
| * reduce the speed of CD drive to 2X while playing CD audio to limit CDJustin McPherson2009-11-121-3/+15
| * gstreamer: Do not call gst_deinit() but do free the device and effect manager...Justin McPherson2009-11-121-1/+0
| * Remove rogue \refs from documentation.Justin McPherson2009-11-122-2/+2
| * Import change 924855 from phonon-svn.Justin McPherson2009-11-121-2/+6
| * Import change 932546 from phonon-svn.Justin McPherson2009-11-1291-91/+91
| * Import change 950964 from phonon-svn.Justin McPherson2009-11-121-2/+2
| * Import change 953828 from phonon-svnJustin McPherson2009-11-121-1/+1
| * Doc: fix typoVolker Hilsheimer2009-11-111-1/+1
| * Doc: Link to the public bug tracker.Volker Hilsheimer2009-11-112-11/+24
| * Changes file updatedaavit2009-11-111-0/+2
| * doc: Fixed some qdoc errors, numXxx() to xxxCount(), etc.Martin Smith2009-11-112-3/+10
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Benjamin Poulain2009-11-1143-20848/+21472
| |\
| | * Fixing warnings in QScopedPointer test caseJoão Abecasis2009-11-111-1/+2
| | * qdoc3: Allow the full signature for QML signals and methodsMartin Smith2009-11-114-25/+41
| | * qdoc3: Output the full signature for QML signals and methodsMartin Smith2009-11-112-2/+5
| | * qdoc3: Fixed a linking problem for qml methods.Martin Smith2009-11-117-88/+152
| | * Def files frozen for 4.6.0 RCShane Kearns2009-11-1120-361/+21660
| | * Switch on DEF filesShane Kearns2009-11-111-10/+19
| | * Rewind def files to betaShane Kearns2009-11-1119-20979/+155
| | * Merge branch '4.6-platform' into 4.6Denis Dzyubenko2009-11-116-9/+56
| | |\
| | * \ Merge commit 'origin/4.6' into 4.6-ceJoerg Bornemann2009-11-11280-2839/+5756
| | |\ \
| | * | | fix tst_qdatastream for Windows CEJoerg Bornemann2009-11-102-3/+2
| | * | | make qfunctions_wince.h C compatible againJoerg Bornemann2009-11-101-0/+4
| | * | | fix WebKit build on Windows CE 6Joerg Bornemann2009-11-096-4/+23
| | * | | tst_largefile.cpp Windows CE compile fixJoerg Bornemann2009-11-092-4/+9
| | * | | compile fix for tst_qfile on Windows CEJoerg Bornemann2009-11-092-1/+2
| | * | | tst_qlistwidget compile fix for Qt without RTTIJoerg Bornemann2009-11-091-1/+1
| | * | | tst_qcombobox: compile without Qt3 supportJoerg Bornemann2009-11-091-2/+2
| * | | | Update the translations of Qt AssistantBenjamin Poulain2009-11-111-221/+230