summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-22159-673/+1282
| | | | | |\ \ \ \ \ \
| | | | | * | | | | | | Check for main.qml firstAlan Alpert2010-06-221-3/+3
| | | | * | | | | | | | Restore neutral movement state if a view is manually positioned.Martin Jones2010-06-245-6/+46
| | | | | |_|_|/ / / / | | | | |/| | | | | |
| | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-247-5/+79
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Prevent value source animations from being registered to start twice.Michael Brasser2010-06-243-0/+47
| | | | | * | | | | | | Make compile.Michael Brasser2010-06-241-1/+1
| | | | | * | | | | | | More script benchmarking.Michael Brasser2010-06-243-4/+31
| | | | * | | | | | | | Update tests following QDeclarativeFlickable::viewport() -> contentIem()Martin Jones2010-06-243-214/+214
| | | | |/ / / / / / /
| | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-2424-53/+291
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Script benchmarking.Michael Brasser2010-06-244-4/+157
| | | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2445-154/+527
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | Update lupdate to recognize concatenated text in QML files.Michael Brasser2010-06-241-16/+56
| | | | * | | | | | | | | Expose the Flickable's internal contentItemMartin Jones2010-06-247-41/+70
| | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Ensure sourcesize is in pixmap cache key.Warwick Allison2010-06-241-0/+6
| | | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-243-0/+36
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | doc: note that calling methods before component completion may have no effectMartin Jones2010-06-233-0/+36
| | | | * | | | | | | | | Use ugly but reliable bitmaps fonts in test.Warwick Allison2010-06-2420-0/+2
| | | | |/ / / / / / / /
| | | | * | | | | | | | Fix unstable qdeclarativeviewer testsBea Lam2010-06-231-2/+2
| | | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2342-138/+427
| | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-232-0/+1
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * | | | | | | | Use Pen with Qt::MiterJoin when drawing Rectangles with gradientsBea Lam2010-06-231-0/+1
| | | | | | * | | | | | | | Update screenshotBea Lam2010-06-231-0/+0
| | | | | * | | | | | | | | Fix and better test Text / TextEdit alignments.Warwick Allison2010-06-2327-56/+326
| | | | | |/ / / / / / / /
| | | | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-232-12/+5
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * | | | | | | | Support for non-literal plural arguments to qsTr() in lupdate (QML).Michael Brasser2010-06-231-12/+4
| | | | | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-236-25/+31
| | | | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | Ensure the view is correctly positioned at component complete.Martin Jones2010-06-236-45/+65
| | | | | | |/ / / / / / / / | | | | | |/| | | | | | | |
| | | | | * | | | | | | | | References to undefined variables throws a ReferenceErrorAaron Kennedy2010-06-236-25/+31
* | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-2973-147/+168
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed deployment paths for WebKit declarative plugin.axis2010-06-291-1/+1
| * | | | | | | | | | | | | Fix s60main linking issue with gcce applicationsMiikka Heikkinen2010-06-291-0/+4
| * | | | | | | | | | | | | Merge branch 'buildSystemFixes' into 4.7-s60axis2010-06-2971-142/+163
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Fixed deployment paths for the symbian/linux-armcc mkspec.axis2010-06-293-6/+7
| | * | | | | | | | | | | | | Fixed a relative path problem in qml demos.axis2010-06-297-7/+7
| | * | | | | | | | | | | | | Added the APP_PRIVATE_DIR_BASE variable.axis2010-06-291-1/+2
| | * | | | | | | | | | | | | Various fixes to autotests when using the symbian/linux-armcc mkspec.axis2010-06-2958-65/+81
| | * | | | | | | | | | | | | Fixed Symbian resources not honoring TARGET with a path.axis2010-06-292-63/+66
| * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-291-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Removed useless comments.axis2010-06-291-4/+0
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-295-2/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-295-2/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-295-2/+27
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-285-2/+27
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | Updated WebKit to 38d650efc92427cd6452f6685d3c40d22428cdb7Simon Hausmann2010-06-285-2/+27
| | | | | |_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | |
* | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-297-13/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | warn about stray meta dataOswald Buddenhagen2010-06-292-4/+8
| * | | | | | | | | | | | | don't complain multiple times about same abuse of //% meta stringsOswald Buddenhagen2010-06-294-0/+30
| * | | | | | | | | | | | | fix double percent sign after migration to yyMsg()Oswald Buddenhagen2010-06-291-2/+2
| * | | | | | | | | | | | | Improved QCommandLinkButton's vertical spacingJohn Brooks2010-06-291-5/+13
| * | | | | | | | | | | | | syncqt: abort on permission error writing to include/QtArvid Picciani2010-06-291-3/+3