summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2015-06-20 17:29:18 +0200
committerMarc Mutz <marc.mutz@kdab.com>2015-06-22 10:43:34 +0000
commit838478ccca638436b6da244c04bf3aaaf31ef05c (patch)
tree8b3da9eff99ffae9bc4df08af108e44c9992c816 /src
parent426d9b9c3ea0c28ab7e7cd065fe4ae597d58a0e9 (diff)
qdoc: mark Location::StackEntry as movable and Location as complex
Location is self-referential, so explicitly mark it as Q_COMPLEX_TYPE. Location::StackEntry is held in QVector, by way of QStack. Change-Id: I4d9001b55b86f0387ae41b93da17d06fb2857ee4 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/tools/qdoc/location.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/tools/qdoc/location.h b/src/tools/qdoc/location.h
index ade7a1518a..1cb8e3aec1 100644
--- a/src/tools/qdoc/location.h
+++ b/src/tools/qdoc/location.h
@@ -105,6 +105,7 @@ private:
int lineNo;
int columnNo;
};
+ friend class QTypeInfo<StackEntry>;
void emitMessage(MessageType type,
const QString& message,
@@ -124,6 +125,8 @@ private:
static QRegExp *spuriousRegExp;
static bool logProgress_;
};
+Q_DECLARE_TYPEINFO(Location::StackEntry, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(Location, Q_COMPLEX_TYPE); // stkTop = &stkBottom
QT_END_NAMESPACE