Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'mainline/4.7' into 4.7 | Morten Johan Sørvig | 2010-05-12 | 1 | -1/+1 |
|\ | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativeengine.cpp tools/qdoc3/htmlgenerator.cpp | ||||
| * | Cleanup: Move import stuff out of the QDeclarativeEngine | Aaron Kennedy | 2010-04-29 | 1 | -1/+1 |
| | | |||||
* | | QtDeclarative: remove spurious semi-colons from the source code | Thiago Macieira | 2010-05-04 | 1 | -2/+2 |
|/ | |||||
* | Update #include of private headers in QtDeclarative | Thiago Macieira | 2010-04-02 | 1 | -2/+2 |
| | | | | | Always use private/. The WinSCW compiler doesn't search the current directory, for whatever reason. | ||||
* | Fix warnings in the declarative module | Thierry Bastian | 2010-03-23 | 1 | -1/+1 |
| | |||||
* | Optimization: Reduce unnecessary QObject allocations | Aaron Kennedy | 2010-03-17 | 1 | -1/+1 |
| | |||||
* | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵ | Warwick Allison | 2010-02-24 | 1 | -0/+116 |
QDeclarativeXXX. |