summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlcompiler.cpp
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2010-02-12 05:29:21 (GMT)
committerBea Lam <bea.lam@nokia.com>2010-02-12 05:29:21 (GMT)
commit62d585e8ec6c09406fa28f9edf29b56b2d67c739 (patch)
tree0662e137af421a61c94dc79deee3eba6f495ee47 /src/declarative/qml/qmlcompiler.cpp
parent9e85baac1842a39d24afd75cf44cf084ab614e8a (diff)
parentf468cb54e4b9a7f19377ca1e07c313beb71e1025 (diff)
downloadQt-62d585e8ec6c09406fa28f9edf29b56b2d67c739.zip
Qt-62d585e8ec6c09406fa28f9edf29b56b2d67c739.tar.gz
Qt-62d585e8ec6c09406fa28f9edf29b56b2d67c739.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'src/declarative/qml/qmlcompiler.cpp')
-rw-r--r--src/declarative/qml/qmlcompiler.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index 26ebd27..10150de 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -126,7 +126,7 @@ bool QmlCompiler::isValidId(const QString &val)
// TODO this will be enforced and return false
if (val.at(0).isLetter() && !val.at(0).isLower()) {
//return false;
- qWarning() << "id '" + val + "' is invalid: ids cannot start with uppercase letters. This will be enforced in an upcoming version of QML.";
+ qWarning().nospace() << "id '" << val << "' is invalid: ids cannot start with uppercase letters. This will be enforced in an upcoming version of QML.";
}
QChar u(QLatin1Char('_'));