summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-0213-3511/+3701
|\
| * Revert "Make s60main static lib not depend on QtCore"Iain2010-04-022-48/+5
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-0114-3516/+3749
| |\
| | * Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-0123-1114/+1251
| | |\
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-0114-3516/+3749
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-0114-3516/+3749
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-3114-3516/+3749
| | | | |\ \
| | | | | * | Fix regression on SymbianShane Kearns2010-03-311-1/+1
| | | | | * | Fix 'make sis' finding the dll on symbianThomas Zander2010-03-314-4/+4
| | | | | * | Merge commit 'origin/4.7' into symbian47Thomas Zander2010-03-31183-2391/+5303
| | | | | |\ \
| | | | | * | | Re-add line that was lost during webkit update.Thomas Zander2010-03-301-0/+1
| | | | | * | | Make s60main static lib not depend on QtCoreThomas Zander2010-03-302-5/+48
| | | | | * | | Remove stray non-latin1 characterThomas Zander2010-03-301-1/+1
| | | | | * | | Update EABI def files for 4.7Shane Kearns2010-03-306-3508/+3456
| | | | | * | | Merge remote branch 'qt/4.7' into 4.7Shane Kearns2010-03-30370-6604/+13998
| | | | | |\ \ \
| | | | | * | | | Exporting QFontDatabase::removeAllApplicationFonts()Alessandro Portale2010-03-292-2/+4
| | | | | * | | | Adding QFontDatabase::removeAllApplicationFonts()Alessandro Portale2010-03-291-0/+5
* | | | | | | | | 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 remote branch 'origin/4.7' into HEADThiago Macieira2010-04-0186-2410/+6521
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-0123-1114/+1251
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-0123-1114/+1251
| | |\ \ \ \ \ \
| | | * | | | | | Fix loading of _debug.dylib plugins under OSX.Roberto Raggi2010-04-011-1/+4
| | | * | | | | | Improve Transform docs.Martin Jones2010-04-011-4/+11
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-012-2/+4
| | | |\ \ \ \ \ \
| | | | * | | | | | 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-012-2/+3
| | | | |\ \ \ \ \ \
| | | | | * | | | | | ModelNode::setObjectValue() must update the object cache.Bea Lam2010-04-011-0/+2
| | | | * | | | | | | typoWarwick Allison2010-04-011-1/+1
| | | * | | | | | | | Add media elements to the QML Elements docs.Martin Jones2010-04-014-10/+27
| | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | 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-011-25/+25
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-014-29/+37
| | | | |\ \ \ \ \ \
| | | | * | | | | | | import "." first - i.e. override it by everything else.Warwick Allison2010-04-011-25/+25
| | | * | | | | | | | 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-011-2/+2
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Fix compilation on Symbian winscwJoona Petrell2010-04-011-2/+2
| | | | |/ / / / / /
| | | * | | | | | | Set positioner size to final size, rather than some random size mid animationMartin Jones2010-04-013-27/+35
| | | |/ / / / / /
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-318-1039/+1138
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Fixed: Declared properties cannot be assigned in declarationRoberto Raggi2010-03-318-1039/+1138
| | | | |/ / / /
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-0163-1296/+5270
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | 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-0145-276/+377
| | |\ \ \ \ \ \ | | | |/ / / / /
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-3160-1287/+5266
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Merge remote branch 'integration/qt-4.7-from-4.6' into 4.7Olivier Goffart2010-03-3116-74/+388
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-03-31331-4852/+10351
| | | |\ \ \ \ \ \