summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qml.pri
Commit message (Collapse)AuthorAgeFilesLines
* Remove QPerformanceTimer now that QElapsedTimer contains the necessary bitsRobin Burchell2013-01-091-4/+2
| | | | | | | | | | | QPerformanceTimer was a copy of QElapsedTimer with some additional functionality which has since been subsumed into QElapsedTimer, so remove the forked code. (backport of cd6ebb4912a5d96c788ea0c838d8a1a06ff4029e from qtdeclarative) Change-Id: Ife1dac4d6c46404b43253680819da21350c65569 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
* Fix compilation of missed network dependYuchen Deng2012-08-031-1/+1
| | | | | | | | qtquick1/src/declarative/qml/qdeclarativeengine.cpp:78:25: fatal error: QNetworkReply: No such file or directory Change-Id: If39be538bd135118d6654e154e86e8a082f03a58 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Don't include pri file from qtbase source directory.Andrew den Exter2012-02-071-2/+3
| | | | | | | The pri file is one line, just duplicate it. Change-Id: Ie541efb5713fa69763ca75a66f97ebaa69cb5a84 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix assert when binding to property variant.Andrew den Exter2012-02-011-2/+0
| | | | | | | | | Remove workarounds for the QVariant meta-type and use it directly and remove QMetaObjectBuilder entirely and use the up to date copy in qtbase. Change-Id: I1ad601906d6b172adc7ce7bb63af28cd578eb5d7 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Import relevant source from Qt 4.8Matthew Vogt2012-01-301-0/+139
Change-Id: I5078db4081d95290c54f39d3c0efc2fc2f62e6a6