diff options
Diffstat (limited to 'src/declarative/qml/qdeclarativeimport.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativeimport.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp index 8bdcef9477..a8d9035079 100644 --- a/src/declarative/qml/qdeclarativeimport.cpp +++ b/src/declarative/qml/qdeclarativeimport.cpp @@ -171,10 +171,16 @@ QDeclarativeImports::~QDeclarativeImports() /*! Sets the base URL to be used for all relative file imports added. */ -void QDeclarativeImports::setBaseUrl(const QUrl& url) +void QDeclarativeImports::setBaseUrl(const QUrl& url, const QString &urlString) { d->baseUrl = url; - d->base = url.toString(); + + if (urlString.isEmpty()) { + d->base = url.toString(); + } else { + //Q_ASSERT(url.toString() == urlString); + d->base = urlString; + } } /*! |