summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativeimport.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Fix assert when placing a .qml file inside $QTDIR/importsKai Koehne2010-09-271-0/+1
| | | | | | | | | | The assert "Internal error: Plugin imported previously with different uri" happens on Windows. $QTDIR\imports, which is prefixed to the search path, is still written with backslashes. Unify this to forward slashes for all paths. Task-number:QTBUG-13994 Reviewed-by: mae
* Internal QML API cleanupAaron Kennedy2010-08-271-71/+86
|
* Fix few declarative code issues discovered by static code analysisJoona Petrell2010-08-241-1/+1
| | | | | Task-number: Reviewed-by: Aaron Kennedy
* Fix inconsistent reporting of module import errors when using versions.Warwick Allison2010-07-051-3/+15
| | | | Task-number: QTBUG-11936
* Don't accept *files* that exist when *directory* is required.Warwick Allison2010-07-021-2/+4
|
* small optimisationLars Knoll2010-06-091-2/+2
| | | | | Don't use fromLocal8Bit() when comparing an ascii string to a QString, use QLatin1String.
* Move copies of toLocalFileOrQrc() to QDeclarativeEnginePrivateBea Lam2010-05-241-15/+6
|
* Add return value for resolveTypeInNamespaceAaron Kennedy2010-05-201-2/+2
|
* 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