diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-03-16 03:09:21 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-03-16 06:36:25 (GMT) |
| commit | 234a4b614e30ec2ad3e161c0dcd4d339182ff9ec (patch) | |
| tree | 7b3dc807cda77141bd1e20901249dd2adf92cd98 /src/declarative/qml/qdeclarativescriptparser.cpp | |
| parent | 733578aec105c2d2bdb3f6ef57ee3195ebb79696 (diff) | |
| download | Qt-234a4b614e30ec2ad3e161c0dcd4d339182ff9ec.zip Qt-234a4b614e30ec2ad3e161c0dcd4d339182ff9ec.tar.gz Qt-234a4b614e30ec2ad3e161c0dcd4d339182ff9ec.tar.bz2 | |
Qt.include() used in WorkerScript is broken on Windows.
The script local filename was used to resolve the source URL rather
than the script URL.
Change-Id: I78aa23eadbd76e100bb872b6ac9459aa9a5ee5ce
Task-number: QTBUG-17977
Reviewed-by: Aaron Kennedy
Diffstat (limited to 'src/declarative/qml/qdeclarativescriptparser.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativescriptparser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativescriptparser.cpp b/src/declarative/qml/qdeclarativescriptparser.cpp index b604706..d9e3ebf 100644 --- a/src/declarative/qml/qdeclarativescriptparser.cpp +++ b/src/declarative/qml/qdeclarativescriptparser.cpp @@ -940,7 +940,7 @@ QDeclarativeParser::Object::ScriptBlock::Pragmas QDeclarativeScriptParser::extra if (l.currentLineNo() == startLine) return rv; - if (pragmaValue == QLatin1String("library")) { + if (pragmaValue == library) { rv |= QDeclarativeParser::Object::ScriptBlock::Shared; replaceWithSpace(script, startOffset, endOffset - startOffset); } else { |