summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-06-2838-578/+1113
|\
| * 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-qml into 4.7Martin Jones2010-06-28114-758/+2621
|\ \ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-2585-380/+1446
| |\ \ \ \
| | * | | | forget to rename the moc include when renaming deviceorientation_maemo.cppRobert Griebl2010-06-251-1/+1
| | * | | | fix namespace macrosRobert Griebl2010-06-251-1/+3
| | * | | | fix QML Viewer resize modesRobert Griebl2010-06-252-5/+8
| | * | | | forgot to cleanup the code a bit after adding Maemo5 supportRobert Griebl2010-06-253-19/+10
| | * | | | Make the QML viewer usable on the N900Robert Griebl2010-06-2513-199/+909
| | * | | | Test QTBUG-11222Warwick Allison2010-06-251-0/+12
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-2523-21/+157
| | |\ \ \ \
| | | * | | | Handle enums in method arguments in the same way as QtScriptAaron Kennedy2010-06-254-1/+36
| | | * | | | Allow custom parsers to handle attached propertiesAaron Kennedy2010-06-254-6/+23
| | | * | | | Allow components to be created from .pragma library JS filesAaron Kennedy2010-06-256-10/+31
| | | * | | | Fix assertAaron Kennedy2010-06-254-2/+22
| | | * | | | Disallow global object properties as property namesAaron Kennedy2010-06-257-2/+23
| | | * | | | Reading a property that doesn't exist throws a ReferenceError testAaron Kennedy2010-06-252-0/+22
| | * | | | | Test ListElement type via type system, not string comparison.Warwick Allison2010-06-256-3/+35
| | * | | | | Test only on X11, not only on Linux (which includes embedded).Warwick Allison2010-06-252-4/+4
| | |/ / / /
| | * | | | Force font selection (and so ensure visual test passes).Warwick Allison2010-06-2522-4/+14
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2459-411/+1040
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | * | | | 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
| * | | | | Tweak Qt Demo BehaviourAlan Alpert2010-06-251-0/+1
| * | | | | Stop other mouse buttons propagatingAlan Alpert2010-06-241-0/+1
| * | | | | Expand on warning messageAlan Alpert2010-06-241-1/+1
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-241675-46144/+35320
| |\ \ \ \ \ | | | |_|/ / | | |/| | |