summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | 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 scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-223-27/+33
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Moved QT_PLUGINS_BASE_DIR and QT_IMPORTS_BASE_DIR to symbian.confMiikka Heikkinen2010-06-222-2/+5
| | * | | | Fix precompiled binary deploymentMiikka Heikkinen2010-06-221-25/+28
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-2299-7343/+2341
| |\ \ \ \ \
| | * | | | | Fix WebKit declarative examples (second try)Simon Hausmann2010-06-221-1/+1
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-2298-7342/+2340
| | |\ \ \ \ \ | |/ / / / / /
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-2298-7342/+2340
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Fix examplesSimon Hausmann2010-06-216-6/+6
| | | * | | | Updated WebKit to 45d1c9149ef8940081fa8dd35854d2b95ebaf3cdSimon Hausmann2010-06-2133-322/+996
| | | * | | | Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066dSimon Hausmann2010-06-217-39/+98
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-2162-6990/+1255
| | | |\ \ \ \
| | | | * | | | Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185Simon Hausmann2010-06-2029-5961/+0
| | | | * | | | Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185Simon Hausmann2010-06-194-3/+17
| | | | * | | | Updated WebKit to 515aae71494436816cd0250cdc52caa4f2566aefSimon Hausmann2010-06-184-5/+13
| | | | * | | | Update S60 stuff after renaming the webkit component.Alexis Menard2010-06-182-5/+5
| | | | * | | | Update qmlchanges from import org.webkit to QtWebKitAlexis Menard2010-06-181-1/+1
| | | | * | | | Updated WebKit to e32cb21d4f1787147bcb681883b96a95f867749aSimon Hausmann2010-06-1813-16/+265
| | | | * | | | Updated WebKit to a99218d1984be36e00966f988123fa7e2b18eec5Simon Hausmann2010-06-185-4/+20
| | | | * | | | Remove the old WebView element in src/import. The new one is in src/3rdparty/...Alexis Menard2010-06-1810-1764/+7
| | | | * | | | Updated WebKit to d7a095a2a9514e1f132b779b99279585820b46f5Simon Hausmann2010-06-188-10/+38
| | | | * | | | Updated WebKit to c6f08f4c13f88491a5d1ae1794c72166af0c26baSimon Hausmann2010-06-1811-4/+1672
| | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-2213-95/+98
| | | | | | |\ \
| | | | | | | * | Remove transparent.qml example for now, until QTBUG-11591 is fixedBea Lam2010-06-221-55/+0
| | | | | | | * | qmldir no longer necessaryBea Lam2010-06-221-4/+0
| | | | | | | * | Add demo thumbnails to Examples/Demos index to make it more interestingBea Lam2010-06-2210-35/+74
| | | | | | | * | DocAaron Kennedy2010-06-221-1/+24
| | | | | | * | | Handle TextInput inputMethodEvent() properlyMartin Jones2010-06-222-2/+18
| | | | | | |/ /
| | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-22125-487/+680
| | | | | | |\ \
| | | | | | * | | Allow QT_TR_NOOP (as a no-op) in ListModel values.Warwick Allison2010-06-222-7/+16
* | | | | | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-255-76/+207
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | 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