summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-31366-4855/+8988
|\
| * Rename QGraphics...Layout classes/QML items to Graphics...LayoutBea Lam2010-05-318-64/+64
| * File shouldn't be in repositoryBea Lam2010-05-311-0/+0
| * Implement removeAt() for layout classes to clean up item removal. AlsoBea Lam2010-05-318-36/+70
| * Split graphicsLayouts example into qgraphicslinearlayout andBea Lam2010-05-3117-593/+773
| * Rename example layoutItem -> layoutitem and improve docsBea Lam2010-05-317-11/+12
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-3113-5/+476
| |\
| | * Add selection methods to TextEditWarwick Allison2010-05-3013-5/+476
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-3010-11/+202
| |\ \
| | * | Updated WebKit to 531b0d7cd2af830f0d17b83b6e4a489794481539Simon Hausmann2010-05-3010-11/+202
| |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-3038-174/+813
| |\ \ | | |/ | |/|
| | * Updated WebKit to eb07c6f9bd50d0d74e9ac19ade4a2fbd5cece7c7Simon Hausmann2010-05-2915-74/+221
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2931-102/+594
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2831-102/+594
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2831-102/+594
| | | | |\
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2731-102/+594
| | | | | |\
| | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2731-102/+594
| | | | | | |\
| | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2631-102/+594
| | | | | | | |\
| | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2631-102/+594
| | | | | | | | |\
| | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2631-102/+594
| | | | | | | | | |\
| | | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2631-102/+594
| | | | | | | | | | |\
| | | | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2531-102/+594
| | | | | | | | | | | |\
| | | | | | | | | | | | * Updated WebKit to 807157e42add842605ec67d9363dd3f1861748caSimon Hausmann2010-05-2531-102/+594
| * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-303-10/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Some tweaks on the QML-enhanced QtDemoAlan Alpert2010-05-303-10/+17
| * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2931-806/+1820
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Fix location of QtMultimedia def filesShane Kearns2010-05-281-3/+0
| | * | | | | | | | | | | | Freeze 4.7 def files on top of 4.6.3Shane Kearns2010-05-287-113/+827
| | * | | | | | | | | | | | Update def files for 4.6.3Shane Kearns2010-05-285-752/+122
| | * | | | | | | | | | | | Add runtime_graphics_system flag to QApplicationPrivate.Jani Hautakangas2010-05-286-5/+12
| | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2824-54/+995
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Add missign license headers.Jason McDonald2010-05-282-0/+82
| | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2722-54/+913
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge commit 'origin/4.7' into symbian47Thomas Zander2010-05-27201-1521/+2729
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2723-56/+915
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / / / | | | | |/| | | | | | | | | | |
| | | | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2623-56/+915
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|/ / / / / | | | | | |/| | | | | | | | | |
| | | | | | * | | | | | | | | | Merge branch '4.7' of scm.dev.troll.no:qt/qt into 4.7Shane Kearns2010-05-26182-616/+280053
| | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian.Liang Qi2010-05-252-2/+17
| | | | | | * | | | | | | | | | | Make link on linux/symbianThomas Zander2010-05-251-0/+1
| | | | | | * | | | | | | | | | | Fix double slashes on few data caging pathsMiikka Heikkinen2010-05-251-2/+2
| | | | | | * | | | | | | | | | | Fix for QRuntimePixmapData serial number setting.Jani Hautakangas2010-05-251-1/+3
| | | | | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2520-58/+911
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|_|_|_|/ / | | | | | | |/| | | | | | | | | |
| | | | | | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2420-58/+911
| | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2420-58/+911
| | | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2420-58/+911
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2220-58/+911
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * \ \ \ \ \ \ \ \ \ Merge commit 'origin/4.7' into symbian47Thomas Zander2010-05-216-14/+140
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * | | | | | | | | | | Enable QTouchEvent for S60 5.0Shane Kearns2010-05-213-12/+45
| | | | | | | | | | | * | | | | | | | | | | Add missing license header.Jason McDonald2010-05-211-0/+41
| | | | | | | | | | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2019-46/+823
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \