summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-311-20/+31
|\
| * Optimize QDeclarativeEngine::importExtensionmae2010-03-311-20/+31
* | Fix bug when adding import paths manuallyAlan Alpert2010-03-311-1/+7
* | Update CommentAlan Alpert2010-03-311-1/+1
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-3174-97/+440
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-31284-2874/+6408
| |\
| | * QGraphicsEffect : Don't rely on the exposedArea when rendering the item into ...Alexis Menard2010-03-311-1/+1
| | * Minor cleanup.Yann Bodson2010-03-312-6/+5
| | * Improve flipable example.Yann Bodson2010-03-319-33/+84
| | * Minor cleanup for visual test framework.Michael Brasser2010-03-315-11/+11
| | * VisibleArea is not a creatable type.Michael Brasser2010-03-311-1/+1
| | * More testing.Michael Brasser2010-03-312-1/+9
| | * Test openUrlExternallyWarwick Allison2010-03-312-2/+29
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-3179-695/+1319
| | |\
| | | * Update examples/declarative.proYann Bodson2010-03-311-1/+1
| | | * Update mouseX(Y) when clicking on a mouse areaLeonardo Sobral Cunha2010-03-313-0/+57
| | | * Declarative examples cleanup.Yann Bodson2010-03-313-25/+31
| | | * Add test.Michael Brasser2010-03-312-0/+75
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-3137-0/+22
| | | |\
| | * | | docWarwick Allison2010-03-311-0/+8
| | * | | example of WebView onAlert, and of popups in general.Warwick Allison2010-03-312-0/+63
| | * | | docWarwick Allison2010-03-311-0/+4
| | * | | Move gitignore to right level, update for Linux.Warwick Allison2010-03-312-2/+5
| | | |/ | | |/|
| | * | Cleanup MouseArea visual tests.Michael Brasser2010-03-3137-0/+18
| | * | See if we can get the visual tests working on qws.Michael Brasser2010-03-301-0/+4
| * | | Fix snapping in listview.Martin Jones2010-03-312-15/+35
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-311-10/+14
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fixed incorrectly clipped video when rendered on QGLWidgetDmytro Poplavskiy2010-03-311-10/+14
* | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-03-3070-669/+1155
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-3039-419/+586
| |\ \ \
| | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-301-0/+3
| | |\ \ \
| | | * | | Fix a crash in QGtkStyle when theme not availableJens Bache-Wiig2010-03-301-0/+3
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-293-0/+7
| | |\ \ \ \
| | | * | | | Exporting QFontDatabase::removeAllApplicationFonts()Alessandro Portale2010-03-292-0/+2
| | | * | | | Adding QFontDatabase::removeAllApplicationFonts()Alessandro Portale2010-03-291-0/+5
| | |/ / / /
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-292-11/+17
| | |\ \ \ \
| | | * | | | Fixed crash in Phonon MMF backend during application shutdownGareth Stockwell2010-03-291-1/+7
| | | * | | | Fixed bitfield-related crash on Symbian WINSCWGareth Stockwell2010-03-291-10/+10
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-296-14/+51
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-295-14/+46
| | | * | | | Compile with MSVC 2005 and 2003 when no platform SDK is usedAndy Shaw2010-03-291-0/+5
| | |/ / / /
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-2926-137/+481
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-293-3/+14
| | | * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-2925-135/+468
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-291-9/+18
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merila2010-03-295-22/+68
| | | |\ \ \ \
| | | * | | | | QS60Style: very tall QSpinBox's buttons hide lineEditSami Merila2010-03-291-9/+18
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-292-1/+4
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | Export QGLContextResource for use with Qt/3DRhys Weatherley2010-03-291-1/+1
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-291-0/+3
| | | |\ \ \ \ \ | | |/ / / / / /