summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Dean Dettman2009-11-2412-11/+121
|\
| * Merge commit '4ea54f03174778a4efdcb802f9179b6e1d17fd88' of oslo-staging-1 int...Simon Hausmann2009-11-243-1/+12
| |\
| | * Cocoa: apps with dialogs hangs on exitRichard Moe Gustavsen2009-11-231-1/+1
| | * Fix symbol exports in QtScript with gccSimon Hausmann2009-11-232-0/+11
| * | Compile fix for win32-icc.Jan-Arve Sæther2009-11-241-0/+12
| * | Don't crash in eval() function when QtScript debugger is attachedKent Hansen2009-11-242-2/+36
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Bill King2009-11-2349-235/+748
| |\ \
| | * | Fix background rendering for read-only comboboxes on Maemo5Robert Griebl2009-11-231-1/+1
| | * | updates french phrasebookPierre Rossi2009-11-231-0/+36
| | * | A few tweaks to the frozen column examplePierre Rossi2009-11-233-2/+11
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-sql-team into 4.6Bill King2009-11-231-5/+13
| |\ \ \
| | * | | Handle errors and data truncation in QMYSQLResult::fetchNext()Derick Hawcroft2009-11-231-5/+13
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Derick Hawcroft2009-11-23350-2679/+2987
| | |\ \ \
| * | \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Bill King2009-11-2249-159/+472
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Bill King2009-11-20314-2528/+2523
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Bill King2009-11-18494-6231/+20216
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Bill King2009-11-13348-22746/+26672
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.6' of ../qt into 4.6Bill King2009-11-09428-4598/+9885
| |\ \ \ \ \ \ \
| * | | | | | | | Don't reset view if a query fails.Derick Hawcroft2009-11-091-4/+5
* | | | | | | | | Docs : Add details to QMdiArea::removeSubWindow()Dean Dettman2009-11-241-2/+4
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge remote branch 'origin/4.6' into 4.6-ceninerider2009-11-2342-230/+693
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-2314-12/+135
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | Support semi-transparent surfaces in the OpenVG graphics systemRhys Weatherley2009-11-223-3/+41
| | * | | | | | | Fixes painting issues when scaling a QGraphicsView.Yoann Lopes2009-11-202-1/+40
| | * | | | | | | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-2071-430/+630
| | |\ \ \ \ \ \ \
| | * | | | | | | | Revert "Do not extend the last toolbar in a line when moving it"Thierry Bastian2009-11-202-8/+6
| | * | | | | | | | Do not extend the last toolbar in a line when moving itThierry Bastian2009-11-202-5/+7
| | * | | | | | | | Q_ASSERT failure when resizing a span to (1,1) in 1st cellGabriel de Dietrich2009-11-202-1/+9
| | * | | | | | | | Fixed antialiasing in the GL based QGraphicsView demos under X11.Trond Kjernåsen2009-11-201-1/+6
| | * | | | | | | | avoid possible crash when showing a modal dialog from a widget destructorThierry Bastian2009-11-202-2/+28
| | * | | | | | | | Fix for tabwidget usesScrollButton being overriden by stylesheetOlivier Goffart2009-11-203-3/+10
| * | | | | | | | | Merge commit 'b7692016f282251002b3e85dfcb5567bd91a12c0' of oslo-staging-1 int...Simon Hausmann2009-11-235-5/+132
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix regression introduced in 1e6b424b692b20dcfec920f8d3563e520ec1ff05João Abecasis2009-11-202-1/+117
| | * | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2009-11-2039-308/+372
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Incorrect DropAction returned by QDrag::exec() on Cocoa.Prasanth Ullattil2009-11-201-1/+1
| | | * | | | | | | | | Marking the shmid segment to be destroyed. It prevents leaks when the app cra...Simone Fiorentino2009-11-201-0/+2
| | * | | | | | | | | | doc: Fixed the last qdoc errors (this time).Martin Smith2009-11-201-3/+12
| * | | | | | | | | | | Merge commit '01fec63b7b8f8cae94f92fca1d806fe8c6156299' of oslo-staging-1 int...Simon Hausmann2009-11-2311-170/+322
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-2037-307/+369
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Revert check for file size to a warning in QFile::mapJoão Abecasis2009-11-191-1/+1
| | * | | | | | | | | | Fixing the frame hierarchy traversing in framecapture WebKit example.Andre Pedralho2009-11-192-21/+18
| | * | | | | | | | | | Updated the 'framecapture' WebKit example according to WebKit API changes.Andre Pedralho2009-11-192-4/+3
| | * | | | | | | | | | Document known issue - window resizing slower on Windows 7 due to gestureVolker Hilsheimer2009-11-191-0/+5
| | * | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2009-11-19422-3776/+13656
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Doc: Adding documentation on Embedded Hardware accelerationMorten Engvoldsen2009-11-195-144/+289
| | * | | | | | | | | | | doc: Added note about including a 3rd party library in the bundle.Martin Smith2009-11-191-1/+7
| * | | | | | | | | | | | Merge remote branch 'staging/4.6' into 4.6Oswald Buddenhagen2009-11-2313-43/+104
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | don't use qWarning for things which are not really warningsOswald Buddenhagen2009-11-202-6/+15
| | * | | | | | | | | | | | fix crash on closing "rightmost" fileOswald Buddenhagen2009-11-201-2/+4
| | * | | | | | | | | | | | fix encodings, take NOswald Buddenhagen2009-11-2010-32/+81