diff options
| author | Chris Adams <christopher.adams@nokia.com> | 2011-08-08 15:00:29 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-17 03:49:58 +0200 |
| commit | cc01e0b1e112aac3a0e515f7accbd05ca5a55ecd (patch) | |
| tree | 33eb2c369c26226ed8e4e91110dcb9145fbb4c30 /src | |
| parent | 953843800b0c7fa946e8b203d4cbe34978e02895 (diff) | |
Allow borderimage .sci source to be a quoted filename
Previously, attempting to set the source property of a border image
via a .sci file to a quoted filename would fail. This commit adds
support for quoted source filenames.
Task-number: QTBUG-20709
Change-Id: Ida54ef42bc07081457fd945bb279f3cc82c26e10
Reviewed-on: http://codereview.qt.nokia.com/2724
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/items/qsgscalegrid.cpp | 2 | ||||
| -rw-r--r-- | src/qtquick1/graphicsitems/qdeclarativescalegrid.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/declarative/items/qsgscalegrid.cpp b/src/declarative/items/qsgscalegrid.cpp index a9eb080d86..e1b76c4158 100644 --- a/src/declarative/items/qsgscalegrid.cpp +++ b/src/declarative/items/qsgscalegrid.cpp @@ -164,6 +164,8 @@ QSGGridScaledImage::QSGGridScaledImage(QIODevice *data) _l = l; _r = r; _t = t; _b = b; _pix = imgFile; + if (_pix.startsWith(QLatin1Char('"')) && _pix.endsWith(QLatin1Char('"'))) + _pix = _pix.mid(1, _pix.size() - 2); // remove leading/trailing quotes. } QSGBorderImage::TileMode QSGGridScaledImage::stringToRule(const QString &s) diff --git a/src/qtquick1/graphicsitems/qdeclarativescalegrid.cpp b/src/qtquick1/graphicsitems/qdeclarativescalegrid.cpp index 83a94ec9de..bcdf92c675 100644 --- a/src/qtquick1/graphicsitems/qdeclarativescalegrid.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativescalegrid.cpp @@ -167,6 +167,8 @@ QDeclarative1GridScaledImage::QDeclarative1GridScaledImage(QIODevice *data) _l = l; _r = r; _t = t; _b = b; _pix = imgFile; + if (_pix.startsWith(QLatin1Char('"')) && _pix.endsWith(QLatin1Char('"'))) + _pix = _pix.mid(1, _pix.size() - 2); // remove leading/trailing quotes. } QDeclarative1BorderImage::TileMode QDeclarative1GridScaledImage::stringToRule(const QString &s) |