Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Search for QML import libraries also in application directory | Kai Koehne | 2010-05-19 | 1 | -4/+10 |
| | | | | | | | | Add QCoreApplication::applicationLibraryPath again to the list of directories to search for possible QML plugins. Task-number: QTBUG-10771 Reviewed-by: mae | ||||
* | 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 | -0/+925 |