Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Replace QList<>* support with QmlListProperty | Aaron Kennedy | 2010-02-09 | 4 | -37/+38 |
| | |||||
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-08 | 2 | -1/+23 |
|\ | |||||
| * | Add getter functions to QAbstractDynamicMetaObject and QmlOpenMetaObjectType | Marco Bubke | 2010-02-08 | 2 | -1/+23 |
| | | | | | | | | | | | | We need some internal stuff in the derived class. Reviewed-By: Kai Koehne | ||||
* | | For local fonts, we can just addApplicationFont() rather than loading data. | Martin Jones | 2010-02-08 | 1 | -4/+10 |
|/ | |||||
* | Fix private header include. | Bea Lam | 2010-02-08 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-05 | 11 | -91/+90 |
|\ | |||||
| * | Fix Behaviors for object-type properties. | Michael Brasser | 2010-02-05 | 1 | -2/+1 |
| | | | | | | | | Task-number: QT-2269 | ||||
| * | Pass symbols::prefix (Action -> QmlAction) | Warwick Allison | 2010-02-05 | 10 | -89/+89 |
| | | |||||
* | | Fix test. | Martin Jones | 2010-02-05 | 1 | -7/+17 |
|/ | |||||
* | Clean up QmlImageReader thread on engine destruction. | Martin Jones | 2010-02-05 | 2 | -12/+19 |
| | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2010-02-04 | 1 | -1/+2 |
| | | | | | | | | git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic Conflicts: src/xmlpatterns/type/qprimitives_p.h tools/linguist/lupdate/main.cpp | ||||
* | doc: There is no easeNone, it is called easeLinear | Thorbjørn Lindeijer | 2010-02-03 | 1 | -1/+1 |
| | | | | Reviewed-by: dt | ||||
* | Really run image reader in its own thread. | Martin Jones | 2010-02-03 | 2 | -122/+136 |
| | |||||
* | Disallow ids that start with uppercase letters and update docs and | Bea Lam | 2010-02-03 | 1 | -2/+2 |
| | | | | | | examples accordingly. Task-number: QT-2786 | ||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2010-02-01 | 2 | -3/+8 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Support animating attached properties. | Michael Brasser | 2010-02-01 | 1 | -1/+1 |
| | | | | | | | | Task-number: QTBUG-5580 | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2010-02-01 | 12 | -250/+444 |
| |\ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/util/qmlpixmapcache.cpp | ||||
| * | | Ensure pixmaps can be retrieved even if they do not fit in the QPixmapCache. | Warwick Allison | 2010-02-01 | 1 | -2/+8 |
| | | | | | | | | | | | | Fixes QT-2280 | ||||
* | | | Compile on machines without SCHED_IDLE | Martin Jones | 2010-02-01 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Move image network access into a separate thread, with decoding. | Martin Jones | 2010-01-29 | 2 | -113/+218 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2010-01-29 | 1 | -2/+4 |
|\ \ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Doc. | Michael Brasser | 2010-01-29 | 1 | -2/+4 |
| | | | |||||
* | | | Don't crash when accessing index -1 | Martin Jones | 2010-01-29 | 1 | -5/+5 |
|/ / | |||||
* | | Clarify QmlPropertyMap::valueChanged docs. | Michael Brasser | 2010-01-22 | 1 | -1/+4 |
| | | |||||
* | | Fixes: Allows qtcreator to build on system installed qt-kinetic | Bill King | 2010-01-21 | 1 | -1/+1 |
| | | |||||
* | | Rename ListModel::set() to ListModel::setProperty() | Aaron Kennedy | 2010-01-20 | 2 | -3/+3 |
| | | | | | | | | | | As QML doesn't support slot overloading, the two ListModel::set() calls must be separated. | ||||
* | | Add more detailed debugging | Aaron Kennedy | 2010-01-20 | 2 | -2/+4 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Bea Lam | 2010-01-20 | 1 | -11/+16 |
|\ \ | | | | | | | | | | into kinetic-declarativeui | ||||
| * | | Remove qHash(QUrl) duplicate | Martin Jones | 2010-01-20 | 1 | -9/+2 |
| | | | |||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2010-01-20 | 1 | -0/+7 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Aaron Kennedy | 2010-01-20 | 2 | -36/+31 |
| | |\ \ | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | * | | | Compile with Qt 4.6.1 | Aaron Kennedy | 2010-01-20 | 1 | -0/+7 |
| | | | | | |||||
| * | | | | Add qHash(QUrl) for QmlPixmapCache. | Martin Jones | 2010-01-20 | 1 | -0/+5 |
| | |/ / | |/| | | |||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2010-01-20 | 1 | -25/+20 |
| |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Use Q_GLOBAL_STATIC for static global. | Martin Jones | 2010-01-20 | 1 | -11/+11 |
| | |/ / | |/| | | |||||
* | | | | Keep empty lists and 1-item lists as lists instead of converting them | Bea Lam | 2010-01-20 | 1 | -21/+57 |
| |/ / |/| | | | | | | | | | | | to null or single objects. This brings back change bc6940f with additional fixes and tests. | ||||
* | | | Revert previous change. Does not work for statically defined list models. | Bea Lam | 2010-01-20 | 1 | -25/+20 |
|/ / | | | | | | | This reverts commit bc6940f53891856a3a6c3d8f1c25a8eaada90b33. | ||||
* | | Avoid using QUrl::toString() in QmlPixmapCache. | Martin Jones | 2010-01-20 | 2 | -21/+32 |
| | | |||||
* | | Fix to correctly return property values that are javascript arrays. | Bea Lam | 2010-01-19 | 1 | -20/+25 |
| | | |||||
* | | Handle whitespace in Connection signal signatures. | Michael Brasser | 2010-01-18 | 1 | -1/+1 |
| | | | | | | | | Task-number: QTBUG-7210 | ||||
* | | Add basic missing stuff (italic, > < & font size) to styledtext. | Martin Jones | 2010-01-15 | 1 | -85/+72 |
| | | |||||
* | | Explicit animations in a transition should mark the property as modified. | Michael Brasser | 2010-01-15 | 1 | -0/+22 |
| | | |||||
* | | QmlGuard the list of objects in a Package. | Michael Brasser | 2010-01-15 | 1 | -1/+23 |
|/ | | | | Don't crash if those objects are deleted before the Package. | ||||
* | More statechange debugging | Aaron Kennedy | 2010-01-14 | 1 | -0/+12 |
| | |||||
* | Remove QByteArray constructor from QmlComponent. | Michael Brasser | 2010-01-13 | 1 | -2/+4 |
| | | | | | | | It was too easily confused with the QString constructor that had completely different semantics. Use setData() instead. Task-number: QTBUG-6590 | ||||
* | Remove duplicate line. | Michael Brasser | 2010-01-13 | 1 | -1/+0 |
| | |||||
* | Don't double enter states at startup. | Aaron Kennedy | 2010-01-12 | 2 | -11/+25 |
| | | | | QT-2697 | ||||
* | Remove extra semicolons. | Michael Brasser | 2010-01-11 | 2 | -2/+2 |
| | |||||
* | Move choice of pipelining to the point request. | Warwick Allison | 2010-01-11 | 2 | -0/+2 |
| | | | | (based on advice from Thiago) | ||||
* | Stop using QGuard | Aaron Kennedy | 2009-12-23 | 3 | -5/+9 |
| | | | | | | This should allow QGuard to be removed from Qt and QObjectPrivate::ExtraData. Having QmlGuard inside QmlDeclarativeData reduces the number of new's, and creating QmlDeclarativeData is faster than QObjectPrivate::ExtraData anyway. |