diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:33:20 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:33:20 +0100 |
| commit | c6d19a89046763f680d7f67c6f9989b4f51fc71e (patch) | |
| tree | ec0441f55801a77085c1737101305580d3073acf /src/websockets/qmaskgenerator.h | |
| parent | c00241ac0389cc4ee03252030e6de1257a9b50fd (diff) | |
| parent | 0ec852ed326efe9747bff1dcdef327c690a944b4 (diff) | |
| download | qtwebsockets-c6d19a89046763f680d7f67c6f9989b4f51fc71e.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I57c01d5a8836903352d7edadc4a10972f57399eb
Diffstat (limited to 'src/websockets/qmaskgenerator.h')
| -rw-r--r-- | src/websockets/qmaskgenerator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/websockets/qmaskgenerator.h b/src/websockets/qmaskgenerator.h index f617389..55cd237 100644 --- a/src/websockets/qmaskgenerator.h +++ b/src/websockets/qmaskgenerator.h @@ -50,7 +50,7 @@ class Q_WEBSOCKETS_EXPORT QMaskGenerator : public QObject Q_DISABLE_COPY(QMaskGenerator) public: - explicit QMaskGenerator(QObject *parent = 0); + explicit QMaskGenerator(QObject *parent = Q_NULLPTR); virtual ~QMaskGenerator(); virtual bool seed() = 0; |