summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-08-0311-41/+113
|\
| * Updated WebKit to d6aa024c84f61d0602bef4eef84efaed7cfeefccSimon Hausmann2010-08-0311-41/+113
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-0336-439/+500
|\ \ | |/ |/|
| * Unbreak QImage::rgbSwapped() for many image formats.Andreas Kling2010-08-031-41/+35
| * Crash when pressing the '£' key on Belgian Keyboard layout (Cocoa)Prasanth Ullattil2010-08-031-3/+5
| * Cocoa: Active QDockWidget does not stay on top of inactive QDockWidgetRichard Moe Gustavsen2010-08-033-0/+24
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-0332-395/+436
| |\
| | * Return 'Unknown' bearer type name for unknown bearer type.Aaron McCarthy2010-08-032-2/+2
| | * Update def files.Aaron McCarthy2010-08-032-1/+5
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-0230-394/+431
| | |\
| | | * Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression)Simon Hausmann2010-08-021-3/+29
| | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-021-2/+3
| | | |\
| | | | * Fixed potential infinite loop in QFileSystemWatcher on Mac.Denis Dzyubenko2010-08-021-2/+3
| | | * | doc: Fixed many qdoc errors.Martin Smith2010-08-025-16/+79
| | | |/
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Jerome Pasion2010-08-021-11/+37
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-0222-370/+318
| | | | |\
| | | * | | Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527.Jerome Pasion2010-08-021-3/+2
| | | | |/ | | | |/|
| | | * | Simplify network manager settings code.Aaron McCarthy2010-08-021-112/+46
| | | * | Use an enum to return the bearer type of a network configuration.Aaron McCarthy2010-08-0221-251/+253
| | | * | Rename QNetworkConfiguration::bearerName() function.Aaron McCarthy2010-08-022-9/+21
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-08-039-14/+29
|\ \ \ \ \
| * \ \ \ \ Merge branch 'symbian3Patches' into 4.7-s60axis2010-08-039-14/+29
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fixed incorrect values for QSysInfo::symbianVersion().axis2010-08-031-2/+2
| | * | | | Fixed circular dependency warning.axis2010-08-031-0/+1
| | * | | | Fixed additional case differences between Gnupoc and Symbian^3.axis2010-07-307-12/+26
* | | | | | Fix Flickable.StopAtBounds behavior when content size < flickable sizeMartin Jones2010-08-031-10/+16
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-0322-70/+198
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Limit the pixmap cache in space as well as in time.Aaron Kennedy2010-08-031-7/+26
| | |/ / / | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-028-41/+47
| |\ \ \ \
| | * | | | QDesktopServices crashes when accessing the NULL X11 variableHurewitz Kevin2010-08-021-4/+8
| | * | | | Revert "Fix the byte order in QImage::fill for 24bpp formats"Olivier Goffart2010-08-021-1/+1
| | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-08-021-11/+37
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-027-37/+34
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Fix crash when setting font decorations on text drawn with QStaticTextEskil Abrahamsen Blomfeldt2010-08-021-1/+6
| | | |/ / / | | |/| | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-317-37/+34
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-317-37/+34
| | | |\ \ \
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-307-37/+34
| | | | |\ \ \
| | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-297-37/+34
| | | | | |\ \ \
| | | | | | * | | Fix the rendering of lines with the X11 paint engineBenjamin Poulain2010-07-291-12/+10
| | | | | | * | | Fix the byte order in QImage::fill for 24bpp formatsJohn Brooks2010-07-291-1/+1
| | | | | | * | | QScript: remove JSC::JSLockOlivier Goffart2010-07-291-4/+0
| | | | | | * | | QScript: document/obsolete things that does not work since the move to JSCOlivier Goffart2010-07-295-20/+23
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-08-0213-22/+125
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fixed build break on Symbian versions earlier than S^3Gareth Stockwell2010-08-021-1/+1
| | * | | | | | | | Fixed qsymbianbearer.qtplugin exports in s60installs.proMiikka Heikkinen2010-08-021-2/+2
| | * | | | | | | | Added support to Phonon MMF backend for playback of Qt resource filesGareth Stockwell2010-08-0212-20/+123
| | | |_|_|_|_|/ / | | |/| | | | | |
* | | | | | | | | Ensure dataChanged doesn't force request for unwanted data in QML views.Martin Jones2010-08-033-5/+23
|/ / / / / / / /
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-021-14/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | State doc fixes, improvementsBea Lam2010-08-021-14/+1
* | | | | | | | | Ensure currentItem is released when the delegate changesMartin Jones2010-08-022-0/+7