diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:33:36 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:33:36 +0100 |
| commit | 7dc1bea678ff2aeb719e7a007e0580d3cc44f72d (patch) | |
| tree | bf1675a7883c41c5add43982631ee5e915cdef81 /src/xmlpatterns/api/qabstractxmlnodemodel.h | |
| parent | b24bd0e87891d9f61e0121cbdcbbe0797863f316 (diff) | |
| parent | 7a8d395a3b1eb5f24aa96509666326bad4218c14 (diff) | |
| download | qtxmlpatterns-7dc1bea678ff2aeb719e7a007e0580d3cc44f72d.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Idb463224cc65c6337e0bc484f443470a88a48aa1
Diffstat (limited to 'src/xmlpatterns/api/qabstractxmlnodemodel.h')
| -rw-r--r-- | src/xmlpatterns/api/qabstractxmlnodemodel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.h b/src/xmlpatterns/api/qabstractxmlnodemodel.h index 603c01c..6b6593d 100644 --- a/src/xmlpatterns/api/qabstractxmlnodemodel.h +++ b/src/xmlpatterns/api/qabstractxmlnodemodel.h @@ -104,7 +104,7 @@ namespace QPatternist { data = 0; additionalData = 0; - model = 0; + model = Q_NULLPTR; } }; } |