diff options
Diffstat (limited to 'src/tools/qdoc/qmlcodemarker.h')
| -rw-r--r-- | src/tools/qdoc/qmlcodemarker.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/qdoc/qmlcodemarker.h b/src/tools/qdoc/qmlcodemarker.h index 805229e366..b3ec03965f 100644 --- a/src/tools/qdoc/qmlcodemarker.h +++ b/src/tools/qdoc/qmlcodemarker.h @@ -54,7 +54,7 @@ public: virtual bool recognizeCode(const QString &code) Q_DECL_OVERRIDE; virtual bool recognizeExtension(const QString &ext) Q_DECL_OVERRIDE; virtual bool recognizeLanguage(const QString &language) Q_DECL_OVERRIDE; - virtual Atom::Type atomType() const Q_DECL_OVERRIDE; + virtual Atom::AtomType atomType() const Q_DECL_OVERRIDE; virtual QString markedUpCode(const QString &code, const Node *relative, const Location &location) Q_DECL_OVERRIDE; @@ -66,7 +66,7 @@ public: virtual QString functionEndRegExp(const QString &funcName) Q_DECL_OVERRIDE; /* Copied from src/declarative/qml/qdeclarativescriptparser.cpp */ - QList<QQmlJS::AST::SourceLocation> extractPragmas(QString &script); + QVector<QQmlJS::AST::SourceLocation> extractPragmas(QString &script); private: QString addMarkUp(const QString &code, const Node *relative, |