summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-23172-3296/+3624
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Warwick Allison2010-03-232-21/+14
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-232-21/+14
| | |\
| | | * API fixes to QGLBuffer.Rhys Weatherley2010-03-222-21/+14
| * | | Usability improvements for photoviewer demo.Yann Bodson2010-03-235-8/+32
| * | | Fix warning.Michael Brasser2010-03-231-1/+1
| * | | Changing the alignment property should trigger a repaint.Alexis Menard2010-03-232-0/+34
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-2334-1657/+257
| |\ \ \
| | * | | Change default RotationAnimation direction.Michael Brasser2010-03-233-9/+10
| | * | | Add missing NOTIFYs.Michael Brasser2010-03-234-7/+41
| | * | | Remove ParentAction.Michael Brasser2010-03-2317-1527/+19
| | * | | Editable tag in photoviewer demo.Yann Bodson2010-03-234-15/+61
| | * | | Small photoviewer improvementsYann Bodson2010-03-233-5/+13
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-232-7/+2
| | |\ \ \
| | | * | | Fix mutex handling that was causing tests to sometimes crash/fail.Bea Lam2010-03-232-7/+2
| | * | | | DocAaron Kennedy2010-03-237-87/+111
| | |/ / /
| * | | | Basic Loader origin safety (for discussion).Warwick Allison2010-03-237-2/+69
| * | | | Show loading progressWarwick Allison2010-03-233-2/+21
| |/ / /
| * | | Fix test (StoreScriptImported shifted enum values)Warwick Allison2010-03-221-2/+11
| * | | Manual merge.Warwick Allison2010-03-2216-11/+95
| * | | Test imports with realistic paths (previously passed accidentally).Warwick Allison2010-03-225-7/+15
| * | | Add Script removal to QmlChanges.txtMartin Jones2010-03-221-0/+38
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2299-1034/+890
| |\ \ \ | | |/ / | |/| |
| | * | Use canonical form for headersKai Koehne2010-03-221-2/+2
| | * | Remove exporting of QDeclarativeContext class symbolsKai Koehne2010-03-221-1/+1
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2298-1031/+887
| | |\ \
| * | \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-225-63/+57
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Fix a problem with the selection losing items when layout is changedThierry Bastian2010-03-221-0/+4
| | * | refactor connections/disconnections in QItemSelectionModelThierry Bastian2010-03-222-60/+26
| | * | small little change to the initialization of item viewsThierry Bastian2010-03-221-3/+1
| | * | disable copy of QPainterPathStroker as its not copiable.Gunnar Sletta2010-03-221-0/+2
| | * | Added warnings on non-created buffer in QGLBufferGunnar Sletta2010-03-221-0/+24
| |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-222-10/+23
| |\ \
| | * | Fixed performance issues when falling back to raster for sub-pixmaps.Samuel Rødal2010-03-221-2/+7
| | * | Dragging headers in item views done rightGabriel de Dietrich2010-03-221-8/+16
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-2292-1512/+2957
| |\ \ \
| | * \ \ Merge branch '4.6-s60' into 4.7-s60axis2010-03-2292-1511/+2956
| | |\ \ \
| | | * | | Fixed updating the VKB display when inputting into QGraphicsWebView.axis2010-03-223-0/+32
| | | * | | QS60Style: All itemviews should indicate selection with tick markSami Merila2010-03-221-3/+3
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-221-1/+1
| | | |\ \ \
| | | | * | | QS60Style assert fails to detect an index failureSami Merila2010-03-221-1/+1
| | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-202-3/+119
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-202-3/+119
| | | | |\ \ \ \
| | | | | * | | | QScriptClass-implemented constructors lead to application crashKent Hansen2010-03-191-1/+3
| | | | | * | | | Improve test coverage of QScriptClass::Callable extensionKent Hansen2010-03-191-2/+116
| | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-204-40/+48
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | / / / | | | | | |/ / / | | | | |/| | |
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-194-40/+48
| | | | |\ \ \ \ | | | |/ / / / /
| | | | * | | | Change fromSymbianRSgImage() to use the newer version of RSgImageJason Barron2010-03-193-38/+42
| | | | * | | | Removed extra space from the command line passed to QProcess in SymbianMiikka Heikkinen2010-03-191-2/+6
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-1924-103/+451
| | | |\ \ \ \ \ | | | | |_|/ / / | | | |/| | | |