summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2010-06-15 12:55:18 (GMT)
committerMartin Smith <martin.smith@nokia.com>2010-06-15 12:55:18 (GMT)
commit2cb5d8f7425bce83b5e95925e15d7920be3d2e8d (patch)
tree8b44fe4a9c0fc286e0017a6f34e669d53cb0299e /src/declarative/graphicsitems/qdeclarativeborderimage.cpp
parente9e93fe79d7451f05a714241f759c557a455de67 (diff)
parent11420641d9341af6615baa21453e08c092f7fb10 (diff)
downloadQt-2cb5d8f7425bce83b5e95925e15d7920be3d2e8d.zip
Qt-2cb5d8f7425bce83b5e95925e15d7920be3d2e8d.tar.gz
Qt-2cb5d8f7425bce83b5e95925e15d7920be3d2e8d.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.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
index 1f1e453..cf458da 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
@@ -138,7 +138,7 @@ QDeclarativeBorderImage::~QDeclarativeBorderImage()
BorderImage can handle any image format supported by Qt, loaded from any URL scheme supported by Qt.
- It can also handle .sci files, which are a Qml-specific format. A .sci file uses a simple text-based format that specifies
+ It can also handle .sci files, which are a QML-specific format. A .sci file uses a simple text-based format that specifies
the borders, the image file and the tile rules.
The following .sci file sets the borders to 10 on each side for the image \c picture.png: