summaryrefslogtreecommitdiffstats
path: root/src/tools/qdoc/qmlcodemarker.h
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2015-06-20 12:58:10 +0200
committerMarc Mutz <marc.mutz@kdab.com>2015-06-21 13:42:49 +0000
commit2422251ee5025a067b14b989153764ab36e43f10 (patch)
tree8758c5b128a38f0aa6266a156385112aa3527e03 /src/tools/qdoc/qmlcodemarker.h
parent08e0963e0862726feaa10c09b0e3b401c89b9224 (diff)
qdoc: don't hold QQmlJS::AST::SourceLocation in QLists
QQmlJS::AST::SourceLocation wasn't marked as movable, and it is larger than void*, so QList<SourceLocation> is horribly inefficient. Fix by marking as movable primitive and holding in QVector instead. The same fix probably is required in QtDeclarative, too. Change-Id: I4e0d2cd32b7e03205d59cbc9900287f77045154a Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/tools/qdoc/qmlcodemarker.h')
-rw-r--r--src/tools/qdoc/qmlcodemarker.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/qdoc/qmlcodemarker.h b/src/tools/qdoc/qmlcodemarker.h
index dabb0d82335..b3ec03965f1 100644
--- a/src/tools/qdoc/qmlcodemarker.h
+++ b/src/tools/qdoc/qmlcodemarker.h
@@ -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,