diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2011-09-27 15:12:22 +0200 |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2011-09-28 08:52:56 +0200 |
| commit | 82cbd0a9740010021853d1c954d788131861fb04 (patch) | |
| tree | 939dffe4b442fbe54f072c74e38309893da0ee35 /src/libs/qmljs/parser/qmljsengine_p.cpp | |
| parent | faa792f3cdf7141004ea83cfc1406fc678520b58 (diff) | |
| download | qt-creator-82cbd0a9740010021853d1c954d788131861fb04.tar.gz | |
QmlJS: Support .import directives in js files.
* Allow .import...
* Fix parsing of JS files when using Lexer::scanDirectives()
* Clean up ImportInfo construction.
* Rename ImportInfo::id to ImportInfo::as.
Change-Id: I888da248f06dc6184db99aa74c3b50d7f2f5e491
Reviewed-on: http://codereview.qt-project.org/5625
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src/libs/qmljs/parser/qmljsengine_p.cpp')
| -rw-r--r-- | src/libs/qmljs/parser/qmljsengine_p.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/libs/qmljs/parser/qmljsengine_p.cpp b/src/libs/qmljs/parser/qmljsengine_p.cpp index 3d9a84e8f1..ca7597dac9 100644 --- a/src/libs/qmljs/parser/qmljsengine_p.cpp +++ b/src/libs/qmljs/parser/qmljsengine_p.cpp @@ -113,7 +113,7 @@ double integerFromString(const QString &str, int radix) Engine::Engine() - : _lexer(0) + : _lexer(0), _directives(0) { } Engine::~Engine() @@ -134,6 +134,12 @@ Lexer *Engine::lexer() const void Engine::setLexer(Lexer *lexer) { _lexer = lexer; } +void Engine::setDirectives(Directives *directives) +{ _directives = directives; } + +Directives *Engine::directives() const +{ return _directives; } + MemoryPool *Engine::pool() { return &_pool; } |