summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-2426-374/+1128
|\ \ \ | |/ / |/| |
| * | 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-243-70/+61
| * | Cherry pick fix for MOBILITY-1063 from Qt Mobility.Aaron McCarthy2010-06-241-6/+29
| * | Cherry pick fix for QTMOBILITY-253 from Qt Mobility.Aaron McCarthy2010-06-245-5/+5
| * | Cherry pick fix for MOBILITY-1063 from Qt Mobility.Aaron McCarthy2010-06-242-57/+96
| * | 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-243-7/+31
| * | Cherry pick fix for MOBILITY-853 from Qt Mobility.Aaron McCarthy2010-06-242-0/+71
| * | Cherry pick fix for MOBILITY-1047 from Qt Mobility.Aaron McCarthy2010-06-241-2/+9
| * | Merge bearermanagement changes from Qt Mobility.Aaron McCarthy2010-06-2410-8/+358
| * | 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-246-159/+223
| * | 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-2314-33/+68
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Simon Hausmann2010-06-231-2/+2
| |\ \ | | |/
| * | We need to swallow the event, otherwise it might pop up several times.kh12010-06-231-0/+1
| * | Set the item data thru the model, so we actually emit dataChanged.kh12010-06-233-2/+10
| * | There where still references to the old Assistant.kh12010-06-231-1/+1
| * | Newly created folders in QFileDialog are disabled on Cocoa.Prasanth Ullattil2010-06-231-9/+9
| * | don't remove the path from the name of included filesOswald Buddenhagen2010-06-231-1/+0
| * | add some commentsOswald Buddenhagen2010-06-231-2/+2
| * | remove support for QMAKE_POST_INCLUDE_FILESOswald Buddenhagen2010-06-232-11/+1
| * | remove unused functionOswald Buddenhagen2010-06-231-4/+0
| * | fix prompt() stdin safety checkOswald Buddenhagen2010-06-231-1/+1
| * | Improve text performance with QtWebKit in Qt 4.7Simon Hausmann2010-06-231-1/+23
| * | Removed support for static linking of QtWebKit.Simon Hausmann2010-06-233-1/+14
| * | 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-235-0/+10
|\ \ \
| * | | 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
| * | | Fix "missing store_build" errorsMiikka Heikkinen2010-06-231-0/+6
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-232-0/+129
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix missing QImage::Format to QVideoFrame::PixelFormat conversion.Andrew den Exter2010-06-232-0/+129
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-231-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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