summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-staging2axis2009-11-2415-13/+127
|\
| * Added some missing build instructions for abld.axis2009-11-242-0/+11
| * 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
| |\ \ \ \ \ \ \ \
| * | | | | | | | | WinCE: only use native menu bars for windows mobileninerider2009-11-231-0/+3
* | | | | | | | | | Mac: Fixes painting artifacts in Graphics ViewBjørn Erik Nilsen2009-11-241-0/+7
* | | | | | | | | | Mac: Fixes broken window decorations for QGraphicsProxyWidget.Bjørn Erik Nilsen2009-11-242-2/+26
* | | | | | | | | | Itemview: Fixes statustip not clearedOlivier Goffart2009-11-242-2/+13
* | | | | | | | | | Fix QFile::map in Linux 64bitOlivier Goffart2009-11-241-1/+1
* | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-11-242-19/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Removed window activation hack, unified and fixed title&icon setting.Janne Anttila2009-11-232-19/+6
* | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Eskil Abrahamsen Blomfeldt2009-11-2347-248/+837
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed endless loop when printing a QTextDocument.Trond Kjernåsen2009-11-231-0/+6
| * | | | | | | | | | | Make the menubar filter out EScape only if there is a current actionThierry Bastian2009-11-232-1/+24
| * | | | | | | | | | | Compile fix for win32-icc.Jan-Arve Sæther2009-11-231-0/+12
| * | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2009-11-2335-229/+636
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fixes qlistview failing autotest: QTBUG_5877_skippingItemInPageDownUpLeonardo Sobral Cunha2009-11-231-1/+1
| | * | | | | | | | | | | Make the buttons react on mouse release only if it was pressedThierry Bastian2009-11-232-2/+6
| | * | | | | | | | | | | Merge 'upstream/4.6' into oslo-staging-2/4.6Olivier Goffart2009-11-2330-220/+564
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-2314-12/+135
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
| | | * | | | | | | | | | 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