diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-04-06 09:12:42 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-04-06 09:13:13 +0200 |
| commit | 0e90e0d2c385d8928d188314ed16d70050b362eb (patch) | |
| tree | 26a55cc9382b9dd0c047aedd529cac248088d492 /src/quick/scenegraph/coreapi/qsgnode.h | |
| parent | 68af8842f5f580dab140f397cfd5683ebdc368cf (diff) | |
| parent | 60da655dff4ffcc94d32a05bb5fa32240b0eaa0b (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: Id98d3514e602a3c8c159a27be7b2fd24d7d290ae
Diffstat (limited to 'src/quick/scenegraph/coreapi/qsgnode.h')
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgnode.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgnode.h b/src/quick/scenegraph/coreapi/qsgnode.h index 74480aaca7..349753a361 100644 --- a/src/quick/scenegraph/coreapi/qsgnode.h +++ b/src/quick/scenegraph/coreapi/qsgnode.h @@ -151,7 +151,7 @@ public: QT_DEPRECATED void clearDirty() { } void markDirty(DirtyState bits); - QT_DEPRECATED DirtyState dirtyState() const { return 0; } + QT_DEPRECATED DirtyState dirtyState() const { return Q_NULLPTR; } virtual bool isSubtreeBlocked() const; |