Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I29e25aef95a7b845bfe7d57d41369fec2f1fd562

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;