summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-0184-1437/+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
| |\
| | * 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/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-0124-3531/+3772
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-0124-3531/+3772
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-3124-3531/+3772
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Fix regression on SymbianShane Kearns2010-03-311-1/+1
| | | * | | Fix broken test caseShane Kearns2010-03-311-0/+7
| | | * | | Cleanup the deployment codeThomas Zander2010-03-315-10/+8
| | | * | | Fix 'make sis' finding the dll on symbianThomas Zander2010-03-314-4/+4
| | | * | | Merge commit 'origin/4.7' into symbian47Thomas Zander2010-03-31210-2558/+5930
| | | |\ \ \
| | | * | | | Re-add line that was lost during webkit update.Thomas Zander2010-03-301-0/+1
| | | * | | | Work around bad naming of exported class in symbian sdk causing conflictThomas Zander2010-03-301-0/+3
| | | * | | | Fix building on public symbian SDK.Thomas Zander2010-03-301-2/+2
| | | * | | | Fix qmake with the symbian makespec failing when project has a dash in itThomas Zander2010-03-301-2/+2
| | | * | | | Make s60main static lib not depend on QtCoreThomas Zander2010-03-302-5/+48
| | | * | | | Remove stray non-latin1 characterThomas Zander2010-03-301-1/+1
| | | * | | | Fix out-of-source symbian build for external appsThomas Zander2010-03-301-1/+1
| | | * | | | Update EABI def files for 4.7Shane Kearns2010-03-306-3508/+3456