diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-06 14:34:19 +0200 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-06 14:34:19 +0200 |
commit | 6d6dcaf5e4bb3a14b943e77a258f422f0270074b (patch) | |
tree | e56144f5f7f39c6e70b73351ad484b96b340d301 | |
parent | f9c0948343efdaf04be7a97546964ea4987b74d0 (diff) | |
parent | 409655f3451815930b70a71baa175ab9f34467ed (diff) | |
download | qtxmlpatterns-6d6dcaf5e4bb3a14b943e77a258f422f0270074b.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I29e25aef95a7b845bfe7d57d41369fec2f1fd562
-rw-r--r-- | src/xmlpatterns/api/qabstractxmlnodemodel.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.h b/src/xmlpatterns/api/qabstractxmlnodemodel.h index 0bdf9c4..98148f7 100644 --- a/src/xmlpatterns/api/qabstractxmlnodemodel.h +++ b/src/xmlpatterns/api/qabstractxmlnodemodel.h @@ -92,10 +92,10 @@ namespace QPatternist }; void *pointer() const { - /* Constructing to qptrdiff means we avoid the warning "cast to pointer - * from integer of different size." + /* Constructing to qptrdiff means we avoid warnings. */ - return (void *)qptrdiff(data); + char *null = 0; + return null + qptrdiff(data); } Data additionalData; |