summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Allow components to be created from .pragma library JS filesAaron Kennedy2010-06-256-10/+31
* Fix assertAaron Kennedy2010-06-254-2/+22
* Disallow global object properties as property namesAaron Kennedy2010-06-257-2/+23
* Reading a property that doesn't exist throws a ReferenceError testAaron Kennedy2010-06-252-0/+22
* Force font selection (and so ensure visual test passes).Warwick Allison2010-06-2522-4/+14
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2459-411/+1040
|\
| * Fix import path in cppextensions declarative example.Christian Kamm2010-06-241-1/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2458-410/+1039
| |\
| | * 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-webkit into 4.7-integrationQt Continuous Integration System2010-06-2417-141/+280
|\ \ \ \ \ \
| * | | | | | Updated WebKit to 2f598e9b7b376d851fe089bc1dc729bcf0393a06Simon Hausmann2010-06-2415-128/+274
| * | | | | | Moved the QML WebKit integration into QtWebKit.sisSimon Hausmann2010-06-243-14/+7
| |/ / / / /
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-245-10/+41
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Manipulate buffer position via 'pPos' in peek()Andreas Kling2010-06-241-2/+2
| * | | | | No more enter & leave events after a popup menu is closed on WindowsPrasanth Ullattil2010-06-241-3/+20
| * | | | | Child windows shown automatically when their parent is shown(Cocoa).Prasanth Ullattil2010-06-241-1/+1
| * | | | | QKeyEvent::text() inconsistency between Linux and MacPrasanth Ullattil2010-06-242-4/+18
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-248-5/+46
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-248-5/+46
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Updated WebKit to b3589e88fb8d581fb523578763831109f914dc2eSimon Hausmann2010-06-238-5/+47
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-2426-374/+1128
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Abort open early if network session is in the process of openning.Aaron McCarthy2010-06-242-5/+20
| * | | | | Cherry pick fix for MOBILITY-800 from Qt Mobility.Aaron McCarthy2010-06-243-70/+61
| * | | | | Cherry pick fix for MOBILITY-1063 from Qt Mobility.Aaron McCarthy2010-06-241-6/+29
| * | | | | Cherry pick fix for QTMOBILITY-253 from Qt Mobility.Aaron McCarthy2010-06-245-5/+5
| * | | | | Cherry pick fix for MOBILITY-1063 from Qt Mobility.Aaron McCarthy2010-06-242-57/+96