diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 11:31:51 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 11:31:51 +0200 |
| commit | 33b456b7868f05817a4da898ff01de4552a28986 (patch) | |
| tree | 2c8796fe5157f8eec824f4ab0a9d65b6dbdebced /src/xmlpatterns/data/qitem_p.h | |
| parent | 690c12790d23dbc8151610b6d20492f9d6eefac5 (diff) | |
| parent | 30a4041893c8132040cd982c9ca1204345801750 (diff) | |
| download | qtxmlpatterns-33b456b7868f05817a4da898ff01de4552a28986.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
Change-Id: If96447854450a284f77e5ec087e76b866ef1bb06
Diffstat (limited to 'src/xmlpatterns/data/qitem_p.h')
| -rw-r--r-- | src/xmlpatterns/data/qitem_p.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/xmlpatterns/data/qitem_p.h b/src/xmlpatterns/data/qitem_p.h index 1654bd9..a395b5e 100644 --- a/src/xmlpatterns/data/qitem_p.h +++ b/src/xmlpatterns/data/qitem_p.h @@ -111,8 +111,7 @@ namespace QPatternist * @ingroup Patternist_xdm * @author Frans Englich <frans.englich@nokia.com> */ - class AtomicValue : public QSharedData - , public CppCastingHelper<AtomicValue> + class Q_AUTOTEST_EXPORT AtomicValue : public QSharedData, public CppCastingHelper<AtomicValue> { public: virtual ~AtomicValue(); @@ -212,7 +211,7 @@ namespace QPatternist inline Item(const Item &other) : node(other.node) { - Q_ASSERT_X(sizeof(QXmlNodeModelIndex) >= sizeof(AtomicValue), Q_FUNC_INFO, + Q_STATIC_ASSERT_X(sizeof(QXmlNodeModelIndex) >= sizeof(AtomicValue), "Since we're only copying the node member, it must be the largest."); if(isAtomicValue()) atomicValue->ref.ref(); |