diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2012-02-16 14:10:12 +0000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-20 16:25:40 +0100 |
| commit | d1c2fb2e33f687ca883c67bcd5e0d73d1de32bdc (patch) | |
| tree | 43bd7633c2191901f881203a0f0a7b2a7a74c04a /src/declarative/qml/qdeclarativeimport.cpp | |
| parent | 08566134e96971a8e8552a10ca7d6f31fca8a618 (diff) | |
| download | qtdeclarative-d1c2fb2e33f687ca883c67bcd5e0d73d1de32bdc.tar.gz | |
Reduce memory by not calling QUrl::toString() multiple times
Change-Id: I57ce25f4e20cac048ff507a8c195b83adc30040d
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
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; + } } /*! |