diff options
| author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2009-06-30 08:39:47 (GMT) |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2009-06-30 08:39:47 (GMT) |
| commit | f55c5b5552cf2ca620d02ff553116ae62061f8b5 (patch) | |
| tree | aad3a3c79db2993e5b6130ffbe4123be95676f2a /src/declarative/qml/qmlscriptparser.cpp | |
| parent | 7cba48bea33dcb80979975b27047d81025d054a5 (diff) | |
| parent | 5732bf283683f0444dbec740cc26c995d9464de6 (diff) | |
| download | Qt-f55c5b5552cf2ca620d02ff553116ae62061f8b5.zip Qt-f55c5b5552cf2ca620d02ff553116ae62061f8b5.tar.gz Qt-f55c5b5552cf2ca620d02ff553116ae62061f8b5.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlscriptparser.cpp')
| -rw-r--r-- | src/declarative/qml/qmlscriptparser.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp index f1d4fd2..f1f1710 100644 --- a/src/declarative/qml/qmlscriptparser.cpp +++ b/src/declarative/qml/qmlscriptparser.cpp @@ -888,5 +888,4 @@ void QmlScriptParser::addNamespacePath(const QString &path) _nameSpacePaths.insertMulti(QString(), path); } - QT_END_NAMESPACE |