diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-03-03 10:45:35 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-03-03 11:41:39 +0000 |
| commit | 0e0c351fff752ceadc99eef5fbcf5a180f453efc (patch) | |
| tree | d722e7a29e7b7af9ecf8ceddf18a1efcc8d75d4e /src/quick/scenegraph/util/qsgengine.h | |
| parent | 8a99d2e11b1d4971faa489cef626b70a7d828d17 (diff) | |
Make public headers compile with -Wzero-as-null-pointer-constant
... or equivalent.
QtBase 5.6 headers already compile that way, so let the other
modules follow suit.
Task-number: QTBUG-45291
Change-Id: Ied526fb2d7adc3a68946d6843a6bd6f475ebf864
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/quick/scenegraph/util/qsgengine.h')
| -rw-r--r-- | src/quick/scenegraph/util/qsgengine.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/scenegraph/util/qsgengine.h b/src/quick/scenegraph/util/qsgengine.h index 325d3a9ca2..f49561d4b0 100644 --- a/src/quick/scenegraph/util/qsgengine.h +++ b/src/quick/scenegraph/util/qsgengine.h @@ -57,15 +57,15 @@ public: }; Q_DECLARE_FLAGS(CreateTextureOptions, CreateTextureOption) - QSGEngine(QObject *parent = 0); + QSGEngine(QObject *parent = Q_NULLPTR); ~QSGEngine(); void initialize(QOpenGLContext *context); void invalidate(); QSGAbstractRenderer *createRenderer() const; - QSGTexture *createTextureFromImage(const QImage &image, CreateTextureOptions options = CreateTextureOption(0)) const; - QSGTexture *createTextureFromId(uint id, const QSize &size, CreateTextureOptions options = CreateTextureOption(0)) const; + QSGTexture *createTextureFromImage(const QImage &image, CreateTextureOptions options = CreateTextureOption()) const; + QSGTexture *createTextureFromId(uint id, const QSize &size, CreateTextureOptions options = CreateTextureOption()) const; }; QT_END_NAMESPACE |