aboutsummaryrefslogtreecommitdiffstats
path: root/bin
Commit message (Collapse)AuthorAgeFilesLines
* Do not modify 'declarative' in file pathsMatthew Vogt2012-05-301-3/+4
| | | | | Change-Id: I527a115f02671577c754a36f3ab0b7086c5c7918 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Merge branch 'master' of git://gitorious.org/qt/qtdeclarative into merge-masterMatthew Vogt2012-03-131-10/+11
|\ | | | | | | Change-Id: Iaefec13503dadfa200539b8de7a2d80fc5bb3bcf
| * Prefer \b word boundary markersMatthew Vogt2012-03-121-10/+11
| | | | | | | | | | | | | | | | /usr/bin/sed on mac does not process '\<' and '\>' boundary markers correctly. Change-Id: I750f7c69579ddcbe39a6246a3d3321cab714fc27 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* | Remove uses of QtGui symbols in QQmlEngine.Matthew Vogt2012-03-071-2/+2
|/ | | | | | | | | Move the code dealing with QImage and QPixmap out of QQmlEngine and into the QtQuick library. QQmlEngine remains the owner of image provider resources, but does not use them directly. Change-Id: I52083581394d9c308db446372883eb7479ccf807 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Merge master <-> api_changesMatthew Vogt2012-03-051-0/+3
| | | | Change-Id: Iad2f07b989b25349fd2d4fff010e24dcd5a1688f
* Rename QDeclarative symbols to QQuick and QQmlMatthew Vogt2012-02-241-0/+639
Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>