diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-02-03 06:12:04 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-02-03 06:12:04 (GMT) |
| commit | dad8d1ba685657db03c066979692f097c6f3be0c (patch) | |
| tree | 34ca518f756cb85c7d944c42cf343f9dd504aaaa /src | |
| parent | 435122348216d7e108e85276a6794cfebbc71d05 (diff) | |
| parent | 9c700d5d0981c9f0ffc8be552a0e7305a3692cb2 (diff) | |
| download | Qt-dad8d1ba685657db03c066979692f097c6f3be0c.zip Qt-dad8d1ba685657db03c066979692f097c6f3be0c.tar.gz Qt-dad8d1ba685657db03c066979692f097c6f3be0c.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qmlcompiler.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp index a7ae649..26ebd27 100644 --- a/src/declarative/qml/qmlcompiler.cpp +++ b/src/declarative/qml/qmlcompiler.cpp @@ -123,8 +123,11 @@ bool QmlCompiler::isValidId(const QString &val) if (val.isEmpty()) return false; - if (val.at(0).isLetter() && !val.at(0).isLower()) - return false; + // 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."; + } QChar u(QLatin1Char('_')); for (int ii = 0; ii < val.count(); ++ii) |