summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativestringconverters.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-041-4/+2
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-191-1/+1
| |\
| * | Optimize string->color conversion in QML.Michael Brasser2010-11-161-4/+2
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ \ \ | | |/ | |/|
| * | Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| |/
* | Remove the use of deprecated qVariant*Olivier Goffart2010-08-061-1/+1
|/
* Fix QT_NO_DATESTRINGTasuku Suzuki2010-07-271-4/+4
* Fix QT_NO_TEXTDATETasuku Suzuki2010-05-251-0/+4
* Make string -> int conversion consistent in bindingsAaron Kennedy2010-04-081-0/+4
* Improve static assignment to QVariant's in the int and double caseAaron Kennedy2010-04-081-4/+0
* Update #include of private headers in QtDeclarativeThiago Macieira2010-04-021-1/+1
* Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to QDec...Warwick Allison2010-02-241-0/+276