summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | 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
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2217-104/+132
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge remote branch 'origin/4.7' into qml-4.7Rohan McGovern2010-06-221573-45368/+32945
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-222-6/+18
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | 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-228-9/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Removed unnecessary data_caging_paths.prf loading from applicationsMiikka Heikkinen2010-06-228-9/+0
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-221457-37974/+30543
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Simon Hausmann2010-06-2299-7343/+2341
| |\ \ \
| * \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-222-4/+7
| |\ \ \ \
| | * | | | Prohibit some property names to be used for dynamic propertiesJarek Kobus2010-06-221-0/+4
| | * | | | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to f0dcb906f...Simon Hausmann2010-06-221-4/+3
| * | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-223-8/+71
| |/ / / /
| * | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-221-1/+45
| * | | | Finish merge conflict.Martin Smith2010-06-22733-15155/+8433
| |\ \ \ \
| | * | | | qdoc3: Build fix for regression in f321a3f2b1eAndreas Kling2010-06-222-4/+4
| | * | | | Clean up HB_Anchor's DeviceTables on failure when loading format 3Andreas Kling2010-06-221-1/+2
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-221456-37965/+30385
| | |\ \ \ \
| | | * | | | Make sure ValueRecord's DeviceTables is cleaned up on failureAndreas Kling2010-06-221-2/+3
| | | * | | | qdoc3: Build fix for regression in e2f0e728eAndreas Kling2010-06-223-6/+5