summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Use custom static scopes to improve QML/JavaScript performanceKent Hansen2010-06-2512-37/+358
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-2417-141/+280
|\
| * Updated WebKit to 2f598e9b7b376d851fe089bc1dc729bcf0393a06Simon Hausmann2010-06-2415-128/+274
| * Moved the QML WebKit integration into QtWebKit.sisSimon Hausmann2010-06-243-14/+7
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-245-10/+41
|\ \ | |/ |/|
| * Manipulate buffer position via 'pPos' in peek()Andreas Kling2010-06-241-2/+2
| * No more enter & leave events after a popup menu is closed on WindowsPrasanth Ullattil2010-06-241-3/+20
| * Child windows shown automatically when their parent is shown(Cocoa).Prasanth Ullattil2010-06-241-1/+1
| * QKeyEvent::text() inconsistency between Linux and MacPrasanth Ullattil2010-06-242-4/+18
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-248-5/+46
|\ \ | |/ |/|
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-248-5/+46
| |\
| | * Updated WebKit to b3589e88fb8d581fb523578763831109f914dc2eSimon Hausmann2010-06-238-5/+47
* | | Abort open early if network session is in the process of openning.Aaron McCarthy2010-06-242-5/+20
* | | Cherry pick fix for MOBILITY-800 from Qt Mobility.Aaron McCarthy2010-06-242-55/+37
* | | Cherry pick fix for MOBILITY-1063 from Qt Mobility.Aaron McCarthy2010-06-241-6/+29
* | | Cherry pick fix for MOBILITY-1063 from Qt Mobility.Aaron McCarthy2010-06-241-51/+18
* | | Cherry pick fix for MOBILITY-965 from Qt Mobility.Aaron McCarthy2010-06-243-10/+147
* | | Cherry pick fix for MOBILITY-800 from Qt Mobility.Aaron McCarthy2010-06-242-6/+29
* | | Cherry pick fix for MOBILITY-853 from Qt Mobility.Aaron McCarthy2010-06-242-0/+71
* | | Cherry pick fix for MOBILITY-1031 from Qt Mobility.Aaron McCarthy2010-06-243-22/+29
* | | Cherry pick fix for MOBILITY-938 from Qt Mobility.Aaron McCarthy2010-06-242-54/+49
* | | Cherry pick fix for QTMOBILITY-240 from Qt Mobility.Aaron McCarthy2010-06-242-62/+88
* | | Make QtFontFamily::symbol_checked a bitfield.Andreas Kling2010-06-241-1/+1
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-234-10/+38
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Simon Hausmann2010-06-231-2/+2
| |\ \ | | |/
| * | Newly created folders in QFileDialog are disabled on Cocoa.Prasanth Ullattil2010-06-231-9/+9
| * | Improve text performance with QtWebKit in Qt 4.7Simon Hausmann2010-06-231-1/+23
| * | When a drag is finished with on Mac, then it should delete itselfAndy Shaw2010-06-232-0/+6
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-234-0/+4
|\ \ \
| * | | Provide the Webkit Qml plugin with a UID3 on SymbianAlessandro Portale2010-06-231-0/+1
| * | | Provide Qml plugins with UID3s on SymbianAlessandro Portale2010-06-233-0/+3
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-231-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix missing QImage::Format to QVideoFrame::PixelFormat conversion.Andrew den Exter2010-06-231-0/+1
* | | | Build declarative before webkit.Alexis Menard2010-06-231-2/+2
| |_|/ |/| |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-231-0/+1
|\ \ \
| * | | Fix build on Symbian^3.Aaron McCarthy2010-06-221-0/+1
* | | | Merge remote branch 'origin/4.7' into qml-4.7Rohan McGovern2010-06-22161-8497/+3018
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix a crash on exit. Destruction order in font database. (Symbian^4)Alessandro Portale2010-06-222-6/+18
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-223-3/+0
| |\ \ \ | | |/ / | |/| |
| | * | Removed unnecessary data_caging_paths.prf loading from applicationsMiikka Heikkinen2010-06-223-3/+0
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Simon Hausmann2010-06-2290-7332/+2331
| |\ \ \ | | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-2290-7332/+2331
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-2290-7332/+2331
| | | |\ \
| | | | * | Updated WebKit to 45d1c9149ef8940081fa8dd35854d2b95ebaf3cdSimon Hausmann2010-06-2133-322/+996
| | | | * | Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066dSimon Hausmann2010-06-217-39/+98
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-2160-6986/+1252
| | | | |\ \
| | | | | * | Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185Simon Hausmann2010-06-2029-5961/+0
| | | | | * | Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185Simon Hausmann2010-06-194-3/+17
| | | | | * | Updated WebKit to 515aae71494436816cd0250cdc52caa4f2566aefSimon Hausmann2010-06-184-5/+13
| | | | | * | Update S60 stuff after renaming the webkit component.Alexis Menard2010-06-182-5/+5