diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-05-15 15:32:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-05-15 15:32:04 +0200 |
| commit | 6e5251dd3d7b21b67693a79d3470ec2ba80ba97e (patch) | |
| tree | 9df6575fa02be4f47bc9a97dafad6ac71f02419f /src/qml/compiler/qqmlirbuilder_p.h | |
| parent | b159b766eb7974419c2f16a01a8d15221c352dbf (diff) | |
| parent | 9ef0d2da99f4593d50c16912d00bef121bb76f9b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/qml/qml/qqmltypeloader.cpp
Change-Id: If9874faf23e813b05ee4cf042133a528d73ba72a
Diffstat (limited to 'src/qml/compiler/qqmlirbuilder_p.h')
| -rw-r--r-- | src/qml/compiler/qqmlirbuilder_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/compiler/qqmlirbuilder_p.h b/src/qml/compiler/qqmlirbuilder_p.h index fa93130252..f8d481e14f 100644 --- a/src/qml/compiler/qqmlirbuilder_p.h +++ b/src/qml/compiler/qqmlirbuilder_p.h @@ -455,14 +455,14 @@ struct Q_QML_PRIVATE_EXPORT Document static void removeScriptPragmas(QString &script); }; -struct Q_QML_PRIVATE_EXPORT ScriptDirectivesCollector : public QQmlJS::Directives +class Q_QML_PRIVATE_EXPORT ScriptDirectivesCollector : public QQmlJS::Directives { - ScriptDirectivesCollector(QQmlJS::Engine *engine, QV4::Compiler::JSUnitGenerator *unitGenerator); - + QmlIR::Document *document; QQmlJS::Engine *engine; QV4::Compiler::JSUnitGenerator *jsGenerator; - QList<const QV4::CompiledData::Import *> imports; - bool hasPragmaLibrary; + +public: + ScriptDirectivesCollector(QmlIR::Document *doc); void pragmaLibrary() override; void importFile(const QString &jsfile, const QString &module, int lineNumber, int column) override; |