summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativeimport.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Search for QML import libraries also in application directoryKai Koehne2010-05-191-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.7Morten Johan Sørvig2010-05-121-1/+1
| | | | | | Conflicts: src/declarative/qml/qdeclarativeengine.cpp tools/qdoc3/htmlgenerator.cpp
* Cleanup: Move import stuff out of the QDeclarativeEngineAaron Kennedy2010-04-291-0/+925