summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | don't overwrite explicitly specified CODECFORTR on UTF-16 inputOswald Buddenhagen2009-11-193-2/+3
| * | | | fix potentially wrong output codec for UTF-16 input filesOswald Buddenhagen2009-11-191-1/+1
* | | | | Fix configure warning for non-symbian buildsJason McDonald2009-11-231-2/+4
* | | | | Mention the changed architecture and license of QtScript in the 4.6.0 changelogSimon Hausmann2009-11-201-0/+2
* | | | | Merge commit 'd9fa92' into origin-4.6Olivier Goffart2009-11-2035-136/+360
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-11-2030-95/+467
| |\ \ \ \ \
| | * | | | | Improved documentation Qt for the Symbian platformAlessandro Portale2009-11-1914-70/+291
| | * | | | | QAbstractSlider: keypad navigation is slow.Frans Englich2009-11-192-4/+74
| | * | | | | Symbian: QKeyEvent:isAutoRepeat() doesn't workFrans Englich2009-11-191-1/+1
| | * | | | | Fix crash when using splash screen, or QPixmap::copy()Shane Kearns2009-11-193-0/+20
| | * | | | | Freeze def files against 4.6.0Shane Kearns2009-11-196-8/+40
| | * | | | | Enabled Qt icon in Symbian also for demos/examples without UID3.Janne Anttila2009-11-192-2/+2
| | * | | | | Added default Qt icon back for Qt demos/examples in Symbian.Janne Anttila2009-11-193-9/+37
| | * | | | | Use relative paths when invoking mifconv.Janne Anttila2009-11-191-1/+1
| | * | | | | Unified ICON keyword handling for ABLD and SBSv2 toolchains.Janne Anttila2009-11-191-2/+3
| * | | | | | Do not recreate the VGImage if the size is unchangedRhys Weatherley2009-11-202-33/+10
| * | | | | | Remove unmatched else in non-EGL mode for OpenVG pixmap dataRhys Weatherley2009-11-201-1/+0
| * | | | | | Prevent a deep copy of QImage::bits() in the OpenVG pixmap implementationRhys Weatherley2009-11-201-2/+10
| * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Olivier Goffart2009-11-194-24/+51
| |\ \ \ \ \ \
| | * | | | | | Item views: make sure the model is connected/disconnected correctlyThierry Bastian2009-11-192-8/+30
| | * | | | | | Item views: make sure the hovered item is updated when scrollingThierry Bastian2009-11-192-16/+21
| * | | | | | | Fixes regression in QListView: Selection would not expend to the full viewportOlivier Goffart2009-11-191-2/+6
| |/ / / / / /
| * | | | | | Add a QTest::qWaitForWindowShown for a failing qlistview autotestLeonardo Sobral Cunha2009-11-191-0/+2
| * | | | | | On main window, the sizegrip visibility was not correctly updatedThierry Bastian2009-11-192-8/+35
| * | | | | | Fixes: QCommandLinkButton crop large icons.Olivier Goffart2009-11-192-8/+39
| * | | | | | Merge upstream/4.6 into oslo-staging-2/4.6Olivier Goffart2009-11-1985-738/+10307
| |\ \ \ \ \ \
| * | | | | | | Complete QVariantAnimation doc to mention qRegisterAnimationInterpolatorThierry Bastian2009-11-191-1/+18
| * | | | | | | Mark QGraphicsItemAnimation as deprecatedThierry Bastian2009-11-192-10/+5
| * | | | | | | Merge branch '4.6' of git@scm.dev.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2009-11-1914-174/+150
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-11-1914-174/+150
| | |\ \ \ \ \ \
| | | * | | | | | Disable linker warning 6780 in RVCT builds for Symbian OSIain2009-11-182-1/+4