diff options
author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2014-09-15 21:48:30 +0200 |
---|---|---|
committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2016-05-13 13:32:08 +0000 |
commit | b6d3bae80317d854d78b5880d8d46cacd0d1a64e (patch) | |
tree | 4ecd01dac33105436efefd123247b02851918a60 /src/qml/qml/qqmldirparser.cpp | |
parent | 872a05475721ad771bd347d1526035e6e7479d30 (diff) |
QtDeclarative fixes and workarounds for NaClwip/nacl
Make QtDeclarative run on Native Client.
Some of these should be looked at more closely at
a later point in time, but will do as workarounds
from now.
Change-Id: Ifddcb45b190c3a80c6137772a05ababb5466ea22
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/qml/qml/qqmldirparser.cpp')
-rw-r--r-- | src/qml/qml/qqmldirparser.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qml/qml/qqmldirparser.cpp b/src/qml/qml/qqmldirparser.cpp index 57b50733ea..ca3e620996 100644 --- a/src/qml/qml/qqmldirparser.cpp +++ b/src/qml/qml/qqmldirparser.cpp @@ -100,6 +100,10 @@ bool QQmlDirParser::parse(const QString &source) _plugins.clear(); _components.clear(); _scripts.clear(); +#ifdef Q_OS_NACL + // ### Work around "only one module identifier" error below + _typeNamespace.clear(); +#endif _designerSupported = false; quint16 lineNumber = 0; |