summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-284-11/+59
|\
| * doc: update the ECMAScript referenceKent Hansen2010-06-281-3/+47
| * Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t...Kent Hansen2010-06-282-8/+4
| * doc: Added more DITA output to the XML generatorMartin Smith2010-06-281-0/+8
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-2622-532/+454
|\ \ | |/
| * Fixed copy-paste error in htmlgenerator.cppRohan McGovern2010-06-261-1/+1
| * Corrected filename case for wincrypt.hMark Brand2010-06-261-1/+1
| * Add qDebug() operator for QGLFormatHarald Fernengel2010-06-252-0/+33
| * Fix conversion between JavaScript Date and QDateTimeKent Hansen2010-06-256-427/+53
| * Avoid memory allocation when converting from Gbk to unicode.Benjamin Poulain2010-06-251-6/+15
| * Warn if surface creation failsHarald Fernengel2010-06-251-1/+4
| * Doc: fixing search bugMorten Engvoldsen2010-06-252-3/+15
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-253-11/+61
| |\
| | * QSemaphore::tryAquire(timeout) -- never times out on an active semaphoreBradley T. Hughes2010-06-252-3/+53
| | * Fix warnings in QSslSocketPrivate::systemCaCertificates()Zeno Albisser2010-06-251-8/+8
| * | doc: Added more DITA output to the XML generatorMartin Smith2010-06-252-8/+66
| |/
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-25204-8078/+4866
| |\
| * | doc: Added more DITA output to the XML generatorMartin Smith2010-06-255-76/+207
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-2518-43/+656
|\ \ \ | | |/ | |/|
| * | Use custom static scopes to improve QML/JavaScript performanceKent Hansen2010-06-2514-37/+652
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-254-6/+4
| |\ \ |/ / /
| * | qmake: Fix CONFIG += exceptions_off with the MSVC project generator, take 2.Jocelyn Turcotte2010-06-244-6/+4
* | | 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
| |\ \ \ | | |/ /