summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativescriptparser.cpp
diff options
context:
space:
mode:
authorJesper Thomschutz <jesper.thomschutz@nokia.com>2010-09-15 07:45:55 (GMT)
committerA-Team <ateam@pad.test.qt.nokia.com>2010-09-15 07:46:55 (GMT)
commitf78119906b0ffc7fd3dd36d6d827d456478a7fd5 (patch)
treee161fe397dedd702f86d186ef32eabcf7cae00d8 /src/declarative/qml/qdeclarativescriptparser.cpp
parent66420856664c7a412b3c9efe4be6ff7a6061e5f2 (diff)
parent05ab8ad1577fc038aa2b3bd96cedda54e6a64979 (diff)
downloadQt-f78119906b0ffc7fd3dd36d6d827d456478a7fd5.zip
Qt-f78119906b0ffc7fd3dd36d6d827d456478a7fd5.tar.gz
Qt-f78119906b0ffc7fd3dd36d6d827d456478a7fd5.tar.bz2
git Merge branch '4.7-upstream' into 4.7-doc
Conflicts: src/gui/kernel/qgesturemanager.cpp
Diffstat (limited to 'src/declarative/qml/qdeclarativescriptparser.cpp')
-rw-r--r--src/declarative/qml/qdeclarativescriptparser.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativescriptparser.cpp b/src/declarative/qml/qdeclarativescriptparser.cpp
index c956051..57cc9ab 100644
--- a/src/declarative/qml/qdeclarativescriptparser.cpp
+++ b/src/declarative/qml/qdeclarativescriptparser.cpp
@@ -895,7 +895,7 @@ QList<QDeclarativeError> QDeclarativeScriptParser::errors() const
static void replaceWithSpace(QString &str, int idx, int n)
{
QChar *data = str.data() + idx;
- QChar space(' ');
+ const QChar space(QLatin1Char(' '));
for (int ii = 0; ii < n; ++ii)
*data++ = space;
}