summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-02206-599/+599
|\
| * Fix compilation: Linguist uses QtDeclarative .cpp and private headersThiago Macieira2010-04-021-1/+1
| * Fix some more Q_PROPERTY followed by semi-colonThiago Macieira2010-04-025-8/+8
| * Autotest: Add QtDeclarative to the "headersclean" testThiago Macieira2010-04-021-1/+1
| * Fix QtDeclarative public headers to include <QtDeclarative/foo.h>Thiago Macieira2010-04-024-9/+9
| * Update #include of private headers in QtDeclarativeThiago Macieira2010-04-02195-580/+580
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-019-5/+41
|\ \ | |/
| * Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-01184-2825/+8575
| |\ | |/ |/|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-0184-1438/+1903
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-0184-1438/+1903
| |\ \
| | * | Fix loading of _debug.dylib plugins under OSX.Roberto Raggi2010-04-011-1/+4
| | * | Remove strange binding loop in Repeater test.Martin Jones2010-04-011-5/+3
| | * | Improve Transform docs.Martin Jones2010-04-012-4/+12
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-0131-274/+524
| | |\ \
| | | * | Doc fixBea Lam2010-04-011-1/+1
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-0123-274/+334
| | | |\ \
| | | | * | Make QML 'hello world' tutorial less confusing.Yann Bodson2010-04-014-23/+22
| | | | * | ModelNode::setObjectValue() must update the object cache.Bea Lam2010-04-012-0/+28
| | | | * | Doc improvements, fixesBea Lam2010-04-0114-203/+272
| | | | * | Remove references to deleted qmldebugger.Bea Lam2010-04-012-46/+11
| | | * | | typoWarwick Allison2010-04-011-1/+1
| | | * | | Test cost of importing and resolving types (but not creating objects).Warwick Allison2010-04-018-0/+189
| | * | | | Add media elements to the QML Elements docs.Martin Jones2010-04-015-19/+39
| | | |/ / | | |/| |
| | * | | Fix Rectangle::gradient rotation doc.Martin Jones2010-04-011-2/+1
| | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-016-27/+41
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-0127-59/+133
| | | |\ \
| | | * | | import "." first - i.e. override it by everything else.Warwick Allison2010-04-016-27/+41
| | * | | | Fix Flickable::visibleArea.xPosition, Flickable::visibleArea.yPosition docsMartin Jones2010-04-011-2/+4
| | | |/ / | | |/| |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-0116-32/+37
| | |\ \ \
| | | * | | Fix imageprovider example compilation on Symbian armJoona Petrell2010-04-011-0/+4
| | | * | | Remove capability flag not available in public SDKsJoona Petrell2010-04-011-2/+0
| | | * | | Fix plugin example compilation on Symbian armJoona Petrell2010-04-012-12/+13
| | | * | | Fix compilation on Symbian winscwJoona Petrell2010-04-011-2/+2
| | | * | | Renamed widgets example to proxywidgets to avoid conflictsJoona Petrell2010-04-017-11/+14
| | | |/ /
| | | * | doc - fix sellingpWarwick Allison2010-04-011-1/+1
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-31141-2212/+2776
| | | |\ \
| | | * | | doc bug relationships more clearlyWarwick Allison2010-03-313-4/+3
| | * | | | Set positioner size to final size, rather than some random size mid animationMartin Jones2010-04-0114-28/+100
| | * | | | Remove effects from element list.Martin Jones2010-04-011-4/+0
| | | |/ / | | |/| |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-319-1040/+1138
| | |\ \ \
| | | * | | Fixed: Declared properties cannot be assigned in declarationRoberto Raggi2010-03-319-1040/+1138
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-01100-1387/+6672
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Skip tst_QGraphicsItem::updateMicroFocus test on Windows and Mac as it does n...Olivier Goffart2010-04-011-0/+4
| * | | | | QScript: more missing APIShimOlivier Goffart2010-04-011-0/+2
| * | | | | Fix compilation warningsOlivier Goffart2010-04-011-2/+2
| * | | | | QScript: fix compilation warningOlivier Goffart2010-04-011-1/+1
| * | | | | QScript: fix APIShim usage.Olivier Goffart2010-04-011-1/+1
| * | | | | QtScript: remove duplicated APIshim in QScriptValueIteratorOlivier Goffart2010-04-011-6/+0
| * | | | | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-04-0180-950/+1009
| |\ \ \ \ \ | | |/ / / /
| * | | | | Attempt to fix the test.Alexis Menard2010-03-311-2/+2