diff options
author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-05-25 10:27:18 (GMT) |
---|---|---|
committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-05-25 10:27:18 (GMT) |
commit | 0dff624cc550254b804540b77b9ddd3c41a26f16 (patch) | |
tree | ed4b7815c0bdf13c1cffd9af6d13f79c4b28e5e2 /src/declarative/graphicsitems/qdeclarativeborderimage.cpp | |
parent | b5702253a08e315b4db5620a1d4b0ffd4c8e0d0f (diff) | |
parent | 2447c023bc0113bace6f31d93ea942f7b8cb17da (diff) | |
download | Qt-0dff624cc550254b804540b77b9ddd3c41a26f16.zip Qt-0dff624cc550254b804540b77b9ddd3c41a26f16.tar.gz Qt-0dff624cc550254b804540b77b9ddd3c41a26f16.tar.bz2 |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeborderimage.cpp')
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativeborderimage.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp index 229e15b..1f1e453 100644 --- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp +++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp @@ -42,8 +42,8 @@ #include "private/qdeclarativeborderimage_p.h" #include "private/qdeclarativeborderimage_p_p.h" -#include <qdeclarativeengine.h> #include <qdeclarativeinfo.h> +#include <private/qdeclarativeengine_p.h> #include <QNetworkRequest> #include <QNetworkReply> @@ -152,16 +152,6 @@ QDeclarativeBorderImage::~QDeclarativeBorderImage() The URL may be absolute, or relative to the URL of the component. */ - -static QString toLocalFileOrQrc(const QUrl& url) -{ - QString r = url.toLocalFile(); - if (r.isEmpty() && url.scheme() == QLatin1String("qrc")) - r = QLatin1Char(':') + url.path(); - return r; -} - - void QDeclarativeBorderImage::setSource(const QUrl &url) { Q_D(QDeclarativeBorderImage); @@ -210,7 +200,7 @@ void QDeclarativeBorderImage::load() d->status = Loading; if (d->url.path().endsWith(QLatin1String("sci"))) { #ifndef QT_NO_LOCALFILE_OPTIMIZED_QML - QString lf = toLocalFileOrQrc(d->url); + QString lf = QDeclarativeEnginePrivate::urlToLocalFileOrQrc(d->url); if (!lf.isEmpty()) { QFile file(lf); file.open(QIODevice::ReadOnly); |