summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2011-01-21 05:38:15 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2011-01-21 14:32:52 (GMT)
commitdb66fddffaba466410590fd3205dbd1e5f7617f7 (patch)
tree0b93d5d001a7e5f45dab8c2dd765b155f38da720 /src
parent0b1971d4a6678ab193838d0b841ae84c723c97b1 (diff)
downloadQt-db66fddffaba466410590fd3205dbd1e5f7617f7.zip
Qt-db66fddffaba466410590fd3205dbd1e5f7617f7.tar.gz
Qt-db66fddffaba466410590fd3205dbd1e5f7617f7.tar.bz2
BorderImage fails for .sci source containing a URL
Task-number: QTBUG-16769 Reviewed-by: Bea Lam (cherry picked from commit 7ddec9f3179bfd854ae53e23ab292de1f9a26377)
Diffstat (limited to 'src')
-rw-r--r--src/declarative/graphicsitems/qdeclarativescalegrid.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativescalegrid.cpp b/src/declarative/graphicsitems/qdeclarativescalegrid.cpp
index 804e91d..3ad0da6 100644
--- a/src/declarative/graphicsitems/qdeclarativescalegrid.cpp
+++ b/src/declarative/graphicsitems/qdeclarativescalegrid.cpp
@@ -136,12 +136,12 @@ QDeclarativeGridScaledImage::QDeclarativeGridScaledImage(QIODevice *data)
if (line.isEmpty() || line.startsWith(QLatin1Char('#')))
continue;
- QStringList list = line.split(QLatin1Char(':'));
- if (list.count() != 2)
+ int colonId = line.indexOf(QLatin1Char(':'));
+ if (colonId <= 0)
return;
-
- list[0] = list[0].trimmed();
- list[1] = list[1].trimmed();
+ QStringList list;
+ list.append(line.left(colonId).trimmed());
+ list.append(line.mid(colonId+1).trimmed());
if (list[0] == QLatin1String("border.left"))
l = list[1].toInt();