summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* QtQuick1: Fix compilation on Windows.Friedemann Kleint2012-02-079-7/+8
| | | | | | | | - Add missing modules, includes. - Fix warnings. Change-Id: I21a6107db6c5978ccfd59c4202cf31e3deba19ca Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix compile failures due to the removal of QInputContext.Andrew den Exter2012-02-071-1/+0
| | | | | | | The class was unused but still included by a couple of files. Change-Id: I8172be02d6185b44cf37d28220b99a1a206c95a0 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Fix license headers to match conventions.Matthew Vogt2012-02-07385-323/+710
| | | | | | | | Files updated to mtach licensing conventions for different types, and license text updated to match current. Change-Id: Ib2c7457fbc3b37907ab3936e176e6f16f8308036 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix qdeclarativedebug* test failures.Andrew den Exter2012-02-034-0/+302
| | | | | | | | | Add a copy of the qmldbg_tcp plugin to be built when the qtdeclarative module is not available, and fix a failure due to metatype enum reordering. Change-Id: I0c0a40bffba327d3342b5def4f6de331ad65e177 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Install binaries and imports to qtbase.Andrew den Exter2012-02-035-7/+6
| | | | | | | Use the Qt.quick1.* variables to determine the DESTDIR. Change-Id: I17b6d1f037b76ed25a005ec56cbc5c82b522ffc6 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Fix crash in QDeclarativePathView test.Andrew den Exter2012-02-022-0/+2
| | | | | | | | | | | Ensure items that are scheduled to be deleted later are also parented to either their view or visualdatamodel, so the items are destroyed when the scene or engine if that happens before a DeferredDelete event can be processed. Change-Id: Id336f298067efee86dd32837f595c55b79bc5450 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add qmlplugindump tool to qtquick1 moduleMatthew Vogt2012-02-021-2/+2
| | | | | Change-Id: I94a52b2207fb2b5dd66e9e4da8f42ddf2daf4da0 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix qdeclarativeecmascript test failure.Andrew den Exter2012-02-021-3/+5
| | | | | | | | Don't use hardcoded constants for the number of methods belonging to QObject as they can and have changed. Change-Id: Iaae3bb6cad34fce6c2351217480755f1ac2f6085 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Fix breakage due to meta-type id reordering in qtbaseAndrew den Exter2012-02-011-1/+7
| | | | | | | | Cherry-pick of 40c8da550cac90460970f1dbdca1e6f02be99a8c in qtdeclarative. Change-Id: I85d0922dc1ddbdfc24c100d8bbf4d085513a5739 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Fix compile failure due to API change in QRegion.Andrew den Exter2012-02-011-1/+1
| | | | | Change-Id: I94929e93970a980285d4a05d856be669b2a3c28f Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Fix assert when binding to property variant.Andrew den Exter2012-02-017-3030/+92
| | | | | | | | | 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>
* Fix compile failures.Andrew den Exter2012-01-317-102/+95
| | | | | | | | Remove uses of QLineControl, QTextControl and QBool and forward declared QGraphicsWidget. Change-Id: Ic5184a1d5aebfb1100ad0e24444b6773f4e617e8 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Modify QtQuick1 to build in Qt5Matthew Vogt2012-01-31117-2071/+370
| | | | | Change-Id: I1c5ccaef420e8f119e761f50b969127f430df7ba Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Import relevant source from Qt 4.8Matthew Vogt2012-01-30423-0/+146396
Change-Id: I5078db4081d95290c54f39d3c0efc2fc2f62e6a6