summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-2857-874/+1329
|\
| * Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t...Kent Hansen2010-06-282-8/+4
| * 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
| * QSemaphore::tryAquire(timeout) -- never times out on an active semaphoreBradley T. Hughes2010-06-251-1/+6
| * Fix warnings in QSslSocketPrivate::systemCaCertificates()Zeno Albisser2010-06-251-8/+8
| * 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
| | |\ \ | | | |/
| * | | 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 /home/dboddie/git/oslo-staging-1 into 4.7David Boddie2010-06-25203-8735/+4214
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | 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/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