summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\ \ \
| | | * | | Add a QGraphicsItem::updateMicroFocus() to QGraphicsItem.Alexis Menard2010-03-313-0/+39
| | | * | | Micro optimization after feedback from Jan-Arve.Alexis Menard2010-03-311-1/+1
| | | * | | Show only one dialog when using QFileDialog on Mac.Alexis Menard2010-03-311-0/+6
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-3062-1219/+5135
| | | |\ \ \
| | | | * | | Re-fix compilation: re-add symbols introduced in Qt 4.6.3 to Qt 4.7Thiago Macieira2010-03-301-0/+2
| | | | * | | Fix bad merge from 4.6.Thiago Macieira2010-03-301-2/+4
| | | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-03-302110-89046/+301191
| | | | |\ \ \
| | | | | * \ \ Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-30150-2746/+5190
| | | | | |\ \ \
| | | | | * \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-302-1/+5
| | | | | |\ \ \ \
| | | | | | * | | | Hack .pro files on windows to define QT_NO_EGLTom Cooksey2010-03-301-0/+1
| | | | | | * | | | Fix QDate::isLeapYear() for years < 1John Layt2010-03-301-1/+4
| | | | | * | | | | Support the pen set on the painter in QStaticText when using rich textEskil Abrahamsen Blomfeldt2010-03-301-0/+5
| | | | | * | | | | Fix setting font for QStaticText on Linux and MacEskil Abrahamsen Blomfeldt2010-03-301-5/+5
| | | | | |/ / / /
| | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-3054-1212/+5099
| | | | | |\ \ \ \
| | | | | | * | | | QScript: More missing APIShimOlivier Goffart2010-03-291-0/+4
| | | | | | * | | | QScriptEngine: Fix reentrency involving creation and desctructions of QScript...Olivier Goffart2010-03-293-24/+80
| | | | | | * | | | Work-around Symbian 10.1's broken egl.hTom Cooksey2010-03-292-4/+9
| | | | | | * | | | Add some #warnings to debug Symbian EGL build failureTom Cooksey2010-03-291-0/+24
| | | | | | * | | | Don't detect EGLImage presence by testing function pointersTom Cooksey2010-03-291-2/+2
| | | | | | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-2921-94/+342
| | | | | | |\ \ \ \