diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:24:27 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:24:27 +0200 |
| commit | 6d019d276a4be4e1a20eaf41a16eca64007249f3 (patch) | |
| tree | e85a4b5eecf47a3b4dfa0f8353af2ed84120f1d0 /src/winextras/qwinthumbnailtoolbar.h | |
| parent | dcb06c7880b89530f3fbbb6bbe519d203dce517d (diff) | |
| parent | e7d198e87396eb160fa9b1163eb73af152e70da2 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Change-Id: I0ce2094980fbd70c017fea7748cbc5c224d974cc
Diffstat (limited to 'src/winextras/qwinthumbnailtoolbar.h')
| -rw-r--r-- | src/winextras/qwinthumbnailtoolbar.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/winextras/qwinthumbnailtoolbar.h b/src/winextras/qwinthumbnailtoolbar.h index b5c78c0..4c98c70 100644 --- a/src/winextras/qwinthumbnailtoolbar.h +++ b/src/winextras/qwinthumbnailtoolbar.h @@ -61,7 +61,7 @@ class Q_WINEXTRAS_EXPORT QWinThumbnailToolBar : public QObject Q_PROPERTY(QPixmap iconicLivePreviewPixmap READ iconicLivePreviewPixmap WRITE setIconicLivePreviewPixmap) public: - explicit QWinThumbnailToolBar(QObject *parent = 0); + explicit QWinThumbnailToolBar(QObject *parent = Q_NULLPTR); ~QWinThumbnailToolBar(); void setWindow(QWindow *window); |