diff options
| author | Bea Lam <bea.lam@nokia.com> | 2011-02-11 01:33:37 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2011-02-11 03:08:39 (GMT) |
| commit | 33512bc223be373975426ffcc6f8fa783a7582c9 (patch) | |
| tree | c92b5b47837e89bcaea472495cf243b21a362c73 /src/declarative | |
| parent | 974db3ce58307069fcafdee2c5636ff72b061134 (diff) | |
| download | Qt-33512bc223be373975426ffcc6f8fa783a7582c9.zip Qt-33512bc223be373975426ffcc6f8fa783a7582c9.tar.gz Qt-33512bc223be373975426ffcc6f8fa783a7582c9.tar.bz2 | |
Make addImportPath() work for windows paths starting with lower case
Was causing assert failure on windows if the 'c:' was lower case,
since it was being added to the import path database with a lower
case and thus later lookups with an upper case 'c:' would fail.
This change fixes the check for whether the path refers to a
local path or not.
Task-number: QTBUG-16885
Change-Id: I0a2a2f705443ed453fb2b13f8599e035c2bd2877
Reviewed-by: Martin Jones
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/qml/qdeclarativeimport.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp index 87183c4..244f2ad 100644 --- a/src/declarative/qml/qdeclarativeimport.cpp +++ b/src/declarative/qml/qdeclarativeimport.cpp @@ -952,7 +952,8 @@ void QDeclarativeImportDatabase::addPluginPath(const QString& path) qDebug().nospace() << "QDeclarativeImportDatabase::addPluginPath: " << path; QUrl url = QUrl(path); - if (url.isRelative() || url.scheme() == QLatin1String("file")) { + if (url.isRelative() || url.scheme() == QLatin1String("file") + || (url.scheme().length() == 1 && QFile::exists(path)) ) { // windows path QDir dir = QDir(path); filePluginPath.prepend(dir.canonicalPath()); } else { @@ -974,7 +975,8 @@ void QDeclarativeImportDatabase::addImportPath(const QString& path) QUrl url = QUrl(path); QString cPath; - if (url.isRelative() || url.scheme() == QLatin1String("file")) { + if (url.isRelative() || url.scheme() == QLatin1String("file") + || (url.scheme().length() == 1 && QFile::exists(path)) ) { // windows path QDir dir = QDir(path); cPath = dir.canonicalPath(); } else { |