diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-24 01:23:03 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-24 01:23:03 (GMT) |
| commit | 10ee284f7722c2479e85d469b179c9311b10238a (patch) | |
| tree | f763d60087111ed6210812b3d028a07513807996 /src/declarative/qml/qmlcompiler.cpp | |
| parent | 1ec06a42b2b18b850b5ede133d1c23a00e6dbe21 (diff) | |
| parent | f95e0d4dee769363a9c84b27f854055b0425e6ec (diff) | |
| download | Qt-10ee284f7722c2479e85d469b179c9311b10238a.zip Qt-10ee284f7722c2479e85d469b179c9311b10238a.tar.gz Qt-10ee284f7722c2479e85d469b179c9311b10238a.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Conflicts:
src/declarative/qml/qml.h
Diffstat (limited to 'src/declarative/qml/qmlcompiler.cpp')
| -rw-r--r-- | src/declarative/qml/qmlcompiler.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp index 4365b17..3702d0b 100644 --- a/src/declarative/qml/qmlcompiler.cpp +++ b/src/declarative/qml/qmlcompiler.cpp @@ -123,10 +123,9 @@ bool QmlCompiler::isValidId(const QString &val) if (val.isEmpty()) return false; - // TODO this will be enforced and return false if (val.at(0).isLetter() && !val.at(0).isLower()) { - //return false; - qWarning().nospace() << "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"; + return false; } QChar u(QLatin1Char('_')); |