summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-2314-33/+68
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Simon Hausmann2010-06-231-2/+2
| | |\ \
| | * | | We need to swallow the event, otherwise it might pop up several times.kh12010-06-231-0/+1
| | * | | Set the item data thru the model, so we actually emit dataChanged.kh12010-06-233-2/+10
| | * | | There where still references to the old Assistant.kh12010-06-231-1/+1
| | * | | Newly created folders in QFileDialog are disabled on Cocoa.Prasanth Ullattil2010-06-231-9/+9
| | * | | don't remove the path from the name of included filesOswald Buddenhagen2010-06-231-1/+0
| | * | | add some commentsOswald Buddenhagen2010-06-231-2/+2
| | * | | remove support for QMAKE_POST_INCLUDE_FILESOswald Buddenhagen2010-06-232-11/+1
| | * | | remove unused functionOswald Buddenhagen2010-06-231-4/+0
| | * | | fix prompt() stdin safety checkOswald Buddenhagen2010-06-231-1/+1
| | * | | Improve text performance with QtWebKit in Qt 4.7Simon Hausmann2010-06-231-1/+23
| | * | | Removed support for static linking of QtWebKit.Simon Hausmann2010-06-233-1/+14
| | * | | When a drag is finished with on Mac, then it should delete itselfAndy Shaw2010-06-232-0/+6
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-235-0/+10
| |\ \ \ \
| | * | | | Provide the Webkit Qml plugin with a UID3 on SymbianAlessandro Portale2010-06-231-0/+1
| | * | | | Provide Qml plugins with UID3s on SymbianAlessandro Portale2010-06-233-0/+3
| | * | | | Fix "missing store_build" errorsMiikka Heikkinen2010-06-231-0/+6
* | | | | | 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-multimedia-staging into 4....Qt Continuous Integration System2010-06-232-0/+129
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix missing QImage::Format to QVideoFrame::PixelFormat conversion.Andrew den Exter2010-06-232-0/+129
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-231-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Build declarative before webkit.Alexis Menard2010-06-231-2/+2
|/ / / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-231-0/+1
|\ \ \ \
| * | | | Fix build on Symbian^3.Aaron McCarthy2010-06-221-0/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2217-104/+132
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge remote branch 'origin/4.7' into qml-4.7Rohan McGovern2010-06-221573-45368/+32945
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-222-6/+18
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fix a crash on exit. Destruction order in font database. (Symbian^4)Alessandro Portale2010-06-222-6/+18
|/ / / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-228-9/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Removed unnecessary data_caging_paths.prf loading from applicationsMiikka Heikkinen2010-06-228-9/+0