summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Enable SSE2 for MSVC x64 builds, as it was incorrectly disabledJohn Brooks2010-06-282-5/+4
* Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t...Kent Hansen2010-06-285-5/+56
* ignore *.vcxproj.userOswald Buddenhagen2010-06-281-0/+1
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-2818-126/+258
|\
| * Don't load ciphers and system certificates for QSslSocket::supportsSsl()Andreas Kling2010-06-283-12/+50
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-28100-1114/+2810
| |\
| | * 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
| * | Merge branch '4.7' of /home/dboddie/git/oslo-staging-1 into 4.7David Boddie2010-06-25921-23048/+12696
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-23290-8113/+3695
| | |\ \
| | * | | Doc: Fixed whitespace issues and added missing files to lists.David Boddie2010-06-233-67/+90
| * | | | Doc: Fixed links in the QML documentation.David Boddie2010-06-182-15/+15
| * | | | Doc: Changed links to explicitly refer to QML objects.David Boddie2010-06-181-11/+11
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/dboddies-oslo-staging-1-qdoc ...David Boddie2010-06-18115-649/+2071
| |\ \ \ \
| * | | | | qdoc: Added a workaround for QML/Qt class name clashes.David Boddie2010-06-186-10/+41
* | | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-282-16/+97
| |_|_|_|/ |/| | | |
* | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-281-0/+8
* | | | | 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
|\ \ \ \ \
| * | | | | 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